On 28.05.2014 17:45, matt.cormier_at_medavie.bluecross.ca wrote:
> Hello all,
> Yes, I joined the list to file a bug. This issue is a subtle user
> interface issue, and if you also consider it an issue it is low priority
> because there is a work around.
> Bug description
> When merging lots of code, many conflicts can arise. Before testing the
> merge these conflicts need to be resolved. This can be done by right
> clicking on the root directory and choosing TortoiseSVN -> Resolve ...
> A dialog window similar to the one below will appear. Let's call this
> the resolve dialog.
> In the resolve dialog you can right click on a file and do stuff to
> merge files. The UI subtly is in
> relation to the OK and Cancel buttons. Let's say you manually resolve
> several files, should
> you hit the Cancel button or the OK button?
> 1. Clicking cancel does not undo any right click merge stuff. It is
> safe to click cancel, it won't
> cancel what you already did.
> 2. Clicking OK can mark everything resolved if you don't understand this
> interface completely.
> I believe the Select/ deselect
> Resolve dialog UI not clear, you can easily accidentally mark all
> conflicts as resolved when you do mean to do that.
> Avoid the resolve dialog. Use svn status and grep for conflicts to get
> a list of the current conflicts. Use another tool to resolve the conflicts
> or manually dig into the directories and resolve the conflicts one at a
> Anyway, I don't have a quick fix for this. There may even be things
> that I have misunderstood or another tool/option that I can use instead
> of this dialog that I am not aware of. Basically I hit that OK button
> accidentally once and was burned. I thought I'd share my trepidation
> with the tortoiseSVN team and see what you think.
The "Resolve" dialog should only be used if the conflicts are already
resolved but you need now to mark those conflicts as resolved so svn
knows they're resolved.
To resolve a lot of conflicts, open the "check for modifications" dialog
and do the resolving from there using the context menu on the conflicts.
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest interface to (Sub)version control
/_/ \_\ http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-05-28 20:03:48 CEST