Automatic code merges when merging streams
We are trying to explore if its possible to do code merges automatically between the streams. We tried changing flow targets and delivering code, but that's more of a manual intervention.
Is there a way to merge the changes automatically and only require manual intervention if there are code conflicts.
If not did someone explore writing an extension to do so.
Appreciate your inputs in advance.
Thanks
Kris Vishwanathan
Is there a way to merge the changes automatically and only require manual intervention if there are code conflicts.
If not did someone explore writing an extension to do so.
Appreciate your inputs in advance.
Thanks
Kris Vishwanathan
11 answers
That sounds like a bug (since the CLI doc states that it will
automerge). The dev team is investigating that in work item 168695.
Cheers,
Geoff
On 7/6/2011 3:23 PM, scottchapman wrote:
automerge). The dev team is investigating that in work item 168695.
Cheers,
Geoff
On 7/6/2011 3:23 PM, scottchapman wrote:
echugheswrote:
'scm accept' will merge non-conflicting changes within files.
e
So, our script takes a workspace, and two streams to merge. It first
accepts all changes from StreamA and then attempts to deliver to
StreamB.
We generated a conflict which can easily be resolved (auto-resolve in
the eclipse client does the right thing).
Instead the script fails because there is a conflict.
I do not see how, by using the CLI, one can automate what the eclipse
client does.
page 2of 1 pagesof 2 pages