Search code examples
eclipsesvnconflictsubversivesvn-merge

SVN Merge conflict during commit

Eclipse + Subversive plugin

On commiting a directory which is out of sync with the SVN a message pops up:

Merge conflict during commit
svn: Commit failed (details follow):
svn: File or directory '.' is out of date; try updating
svn: resource out of date; try updating

Tried to update the whole project from Eclipse Navigator view (right click>Refresh or F5) and the problem still persists.

Is there something that can be done in this case?

Solution

  • You are mixing up two different operation in Eclipse:

    • Update (from version control)

    and

    • Refresh

    "update" means retrieve the most recent version of a file(s) from the version control system. "Refresh" just means that Eclipse will update its view of the local filesystem, in case a file was changed outside Eclipse.

    You need to do an update (Team->Update).