Can't auto resolve adjacent line changes?
Scott Chapman (321●65●47)
| asked Jul 22 '11, 9:49 a.m.
edited Oct 12 '17, 1:13 p.m. by David Lafreniere (4.8k●7) I just realized that changes to adjacent lines cannot be auto-resolved.
|
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! David Lafreniere selected this answer as the correct answer
|
2 other answers
The auto-resolve is performed using capabilities provided by Eclipse.
|
I just realized that changes to adjacent lines cannot be auto-resolved. 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 |
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.
Comments
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)
I agree with Scott.. anyone from scm team could confirm Anthony's information? Who tries to auto resolve files conflicts? RTC or Eclipse?
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