Re: TIP: Choosing an SVN Client for Eclipse
Posted: Thu Jan 21, 2010 11:37 am
Seems the consensus is now that Subclipse is the better tool for the job than Subversive. Perhaps time to update this tip ?
Kahuna wrote:We've converted to Subclipse now and it seems a little more speedy than Subversion, however the concept of fixing conflicts is not really very straight forward in this software.
In Subverssion, where there was a conflict, we could use the 'Override and Commit' to move local changes to the SVN, that option is not in Subclipse?
'Mark as Merged' seems like the only way to resolve conflicts without overwriting local resources - and (to my mind anyway) that suggests that the conflict is simply discounted and the differences are not actually resolved? Is that how it works?
What's the best way to resolve conflicts if you want to apply the local changes to the SVN in Subclipse?
jcompagner wrote:
just as i almost never use mark as merged-> use my version, i almost always try to merge them in the compare window by copying the changes over. Or say that i want the incoming version.
jcompagner wrote:Sorry was not completely clear:
First does do an update
Then you have a conflict file
there you can say on Mark Resolved... that will bring up an dialog with options what you exactly want to do.
Before that you can first say-> Edit Conflicts that will bring up the compare window with the conflict pointed out to you.
ROCLASI wrote:What are you trying to do exactly. You want to share/commit it to the external SVN and then connect it back again to the internal SVN ?