On Friday, June 15, 2018 at 5:50:24 PM UTC+2, Matt Smith wrote: > > Hello, > > I'm getting familiar with the new dialog but not everything is clear. If > there's doc's online I'm not finding them and any assistance is > appreciated. >
https://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-merge.html#tsvn-dug-merge-conflict > Most make sense but these I'm not sure of > > Accept base : This sounds like a revert of the file entirely from any > changes I might have had and any changes brought in by a merge? > Not quite a revert: the "accept base" only applies to the conflicted part. The parts that can be merged will still be merged. > > Accept incoming for conflicts : Accept changes only where the conflict. I > understand this but I don't see the use case. Why would we want to do that? > > It's the same as "Accept base" but instead of using the base for the conflicted part, incoming changes are used for the conflicted part. Stefan -- You received this message because you are subscribed to the Google Groups "TortoiseSVN" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/tortoisesvn/96c3f9fe-6379-4034-aa28-b8bb546a8889%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
