SVN Merge conflict during commit
Solution 1
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).
Solution 2
You should update, resolve conflicts, then commit again.
See this link for help on resolving conflicts in eclipse.
Solution 3
Sometimes eclipse+subversion gets a bit lost and a more robust solution is called for:
- Copy the code with changes to a different location (preferably via copy and paste).
- Replace with latest from repo (or revert) on the directory giving the problem
- Copy the changes back (via cut and paste again) and check in.
Solution 4
try to delete .svn/all-wcprops. maybe it will help
Boris Pavlović
Interested in developing programming, concurrent model design skills, design patterns, refactoring, testing... Computer languages: java, javaScript, sql, fsp, erlang...
Updated on October 11, 2020Comments
-
Boris Pavlović over 3 years
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?