Conflict handling by SVN commit

[Karel Broer]

When performing a commit to the SVN server, this error occured:

Code: Select all

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

I do not want to update here, but I'dd like to see what causes the conflict and compare the code.
Anybody knows how to do that?

[Karel Broer]

Just found out the solution (sorry for being a newbee here)...
When a conflict occurs, then choose Synchronise with Repository instead of Commit.
Then Eclipse will show the Team Synchronization perspective and lets you resolve the conflict manually!

[ROCLASI]

Hi Karel,

It's good practice to always use Synchronize first because some other developer might have touched something that you worked on already. And it will also show any other updated code as well that you can fetch (Update).