SVN Merge conflict during commit

eclipse svn conflict subversive svn-merge
Boris Pavlović picture Boris Pavlović · Aug 6, 2009 · Viewed 23.8k times · Source

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?

Answer

sleske picture sleske · Aug 6, 2009

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).

Related questions

How to configure Beyond Compare 3 for Eclipse conflict resolution?

What is the correct parameters to get Beyond Compare 3 working with Eclipse/Subclipse conflict resolution? In Preferences > Team > SVN > Diff/Merge there's the option to specify an external program to resolve conflicts. The default parameters are: "${yours}" "${…

Read More
What are the pros and cons of the SVN plugins for Eclipse, Subclipse and Subversive?

SVN in Eclipse is spread into two camps. The SVN people have developed a plugin called Subclipse. The Eclipse people have a plugin called Subversive. Broadly speaking they both do the same things. What are the advantages and disadvantages of …

Read More
How to change credentials for SVN repository in Eclipse?

I have Eclipse 3.4.2 installed on Windows with subclipse. Another developer added an SVN repository with his credentials and selected 'Save password'. Now every time I do anything with SVN his cached credentials are used. How can I change them to …

Read More