Where can I read about the options for the new merge conflict dialog?

[Matt Smith]

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. 

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?

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?

Thanks for the help and thanks to everyone for updating the product overall. 

[Stefan]

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

[Matt Smith]

Thanks for answering my questions Stefan, I appreciate your time and dedication.