|Merge gives the possibility to merge again [message #902798]
||Mon, 20 August 2012 13:39
| Mikael Petterson
Registered: July 2009
Since there is no official group to ask about "Team" components I will use this fora.
I am trying to accomplish a merge using the following code:
VersionMergeInput input = new VersionMergeInput(cmpConfig,(IFile)resource,selected,comparableVersion,base,provider);
The VersionMergeInput extends CompareEditorInput class.
My problem is that when the CompareEditor opens up and I change one difference and save it to the checked out file.
Then when I do a diff again the conflict still persists ( red arrow pointing to left and right) and I can merge the same line again...
How can I avoid a resolved diff to be marked as unresolved?
Powered by FUDForum
. Page generated in 0.01667 seconds