[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[Subclipse-users] Choosing which version to take during an interbranch merge...

From: Ashley Collins <acollin2_at_hotmail.com>
Date: 2006-02-18 12:37:46 CET


I recently did an interbranch merge which turned up around 65 conflicts.
Most of the time I knew that I wanted to accept the incoming version without
needing to "Edit conflicts".

Is it possible to add "Keep local version" ,"Accept incoming version" and
"Edit conflicts" to the right click menu in the "Team Synchronize" view?
This would allow multiple files to be selected at once and avoid the need to
"Edit conflicts" and cutting and pasting the incoming file contents into the
local version for each file.

I also have a couple of related questions... The default double click action
for a file with conflicts is "Compare Editor" and not "Edit conflicts". Is
this expected?

One last observation, files with conflicts aren't selected by the "Conflicts
mode" in the "Team Synchronize" view. Is this expected?


To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Sat Feb 18 12:37:55 2006

This is an archived mail posted to the Subclipse Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.