On 03.04.2014 05:41, Heath Raftery wrote:
> Thought this would be a FAQ, but could find reference to it. Scenario
> is no branches, no conflicts, just a trunk and two users.
> User A modifies file F. User A commits file F. User B modifies file
> F. User B updates their working copy.
> Tortoise shows:
> Command Update Merged file F. Completed At revision: x
> No dramas, but User B being a conscientious person, wants to check if
> A's changes really don't clash with their own. Unfortunately, unlike
> a conflict, we can't view the "mine", "theirs", "base" and "merged"
> results. The best option from the right-click menu on the merged file
> is "Compare with working copy", which shows A and B's changes as if
> they were both made by the same person.
> What I'm looking for is a way to view something similar to the
> conflict resolution option, where I can see person A's changes, my
> own changes, and the merged result.
> FWIW, I use Beyond Compare to do conflict resolution.
> It seems a real pity that an automatic, conflict-free merge on update
> can potentially create bugs because it's not easy to see what the
> changes were.
If you don't want automatic merging, then you can disable it:
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-04-03 20:09:25 CEST