Skip to main content

Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » Eclipse Platform » Merge gives the possibility to merge again
Merge gives the possibility to merge again [message #902798] Mon, 20 August 2012 13:39
Mikael Petterson is currently offline Mikael PettersonFriend
Messages: 156
Registered: July 2009
Senior Member

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?


Previous Topic:How do I remove a classpath entry from a classpath container initialized by another plugin?
Next Topic:Add a Command Contribution Item to the editor/view Tab popup menu
Goto Forum:

Current Time: Wed Sep 23 21:15:57 GMT 2020

Powered by FUDForum. Page generated in 0.01882 seconds
.:: Contact :: Home ::.

Powered by: FUDforum 3.0.2.
Copyright ©2001-2010 FUDforum Bulletin Board Software

Back to the top