Conflict handling by SVN commit

Questions and answers regarding the use of eclipse environment as seen in Servoy Developer

Conflict handling by SVN commit

Postby Karel Broer » Wed Nov 25, 2009 12:07 pm

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
ServoyCamp - http://www.servoycamp.com
User avatar
Karel Broer
 
Posts: 779
Joined: Mon May 03, 2004 12:49 am
Location: Doetinchem

Re: Conflict handling by SVN commit

Postby Karel Broer » Wed Nov 25, 2009 12:57 pm

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! 8)
Karel Broer
ServoyCamp - http://www.servoycamp.com
User avatar
Karel Broer
 
Posts: 779
Joined: Mon May 03, 2004 12:49 am
Location: Doetinchem

Re: Conflict handling by SVN commit

Postby ROCLASI » Wed Nov 25, 2009 3:23 pm

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).
Robert Ivens
SAN Developer / Servoy Valued Professional / Servoy Certified Developer

ROCLASI Software Solutions / JBS Group, Partner
Mastodon: @roclasi
--
ServoyForge - Building Open Source Software.
PostgreSQL - The world's most advanced open source database.
User avatar
ROCLASI
Servoy Expert
 
Posts: 5438
Joined: Thu Oct 02, 2003 9:49 am
Location: Netherlands/Belgium


Return to Eclipse Environment

Who is online

Users browsing this forum: No registered users and 3 guests