CODEWITHSUNDEEP
eclipsesvnmergesubclipse
Garret Wilson
Garret Wilson

Reputation: 21386

Subversion Eclipse Subclipse "local missing, incoming edit upon merge"

I'm using Eclipse 4.4RC4 with Subclipse 1.10.5. I added small chnages in r1000 that I don't need anymore, so I asked Eclipse to revert all changes in r1000. This mostly worked, except that FooBar.java has since moved from /path/old to /path/new, so I can't commit and I get the following "SVN Tree Conflicts":

/path/old/FooBar.java local missing, incoming edit upon merge

I have two questions:

I realize that similar questions have been asked before on this forum, but I found none specific to Eclipse/Subclipse, and none seemed to provide a good solution in that context.

Upvotes: 1

Views: 1300

Answers (1)

Garret Wilson
Garret Wilson

Reputation: 21386

It turns out that the Subclipse "SVN Tree Conflicts" tab (Team|Show Tree Conflict as others have noted) offers a Resolve... option in the main context menu of that tab (not in the Team context menu). Clicking on it brought up a resolve dialog that allowed me to choose the new destination of FooBar.jar so that the merge could continue and be applied to the correct file. Very cool! The merge succeeded, the correct destination file was modified, and I was allowed to perform the commit.

Upvotes: 2

Related Questions