Can't auto resolve adjacent line changes?
Accepted answer
I tried your scenario and auto-resolve worked fine for me. See details on https://jazz.net/jazz/web/projects/Rational%20Team%20Concert#action=com.ibm.team.workitem.viewWorkItem&id=214697 . Can you comment on that work item and give us more details? It's possible something related to your content, content type, line delimiter is causing trouble, but more context is required to help you. Thanks!
2 other answers
I just realized that changes to adjacent lines cannot be auto-resolved.
Change line 1 in Stream A and line 2 in Stream B, deliver from Stream A -> Stream B results in a merge conflict which cannot be auto-merged.
Really?
I am fairly sure that the merge is done by the Eclipse merge tool - nothing directly to do with RTC. As they say "Other merge tools are available" :-)
anthony
Comments
Scott Chapman
Jun 14 '12, 9:18 a.m.It should auto-resolve which is RTC before it gets to the merge tool in eclipse. We also get the same behavior using the CLI (non-eclipse)
1 vote
Fausto Lemos
Jun 14 '12, 9:18 a.m.I agree with Scott.. anyone from scm team could confirm Anthony's information? Who tries to auto resolve files conflicts? RTC or Eclipse?
Fausto Lemos
Jun 14 '12, 9:17 a.m.An enhancement was opened by Geoff about that....
https://jazz.net/jazz/web/projects/Rational%20Team%20Concert#action=com.ibm.team.workitem.viewWorkItem&id=214697