It's all about the answers!

Ask a question
QuestionsTagsUsersBadges
Follow this question
Question details

×42,787

question asked: Apr 11 '11, 4:50 p.m.
question was seen: 6,554 times
last updated: Apr 11 '11, 4:50 p.m.

Related questions

FAQ - How this Forum works

Automatic code merges when merging streams

0
Kris Vishwanathan (6●1) | asked Apr 11 '11, 4:50 p.m.
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

11 answers

Most liked answers ↑|Newest answers|Oldest answers

0
permanent link
Geoffrey Clemm (30.1k●3●30●35) | answered Jul 07 '11, 10:15 a.m.
FORUM ADMINISTRATOR / FORUM MODERATOR / JAZZ DEVELOPER
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:
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.

Your answer

Register or to post your answer.


Dashboards and work items are no longer publicly available, so some links may be invalid. We now provide similar information through other means. Learn more here.