How to prevent, skip or override auto merge actions?

[Brett]

I have a merge where I can resolve some conflicts, but there is a tab with auto merge actions which are just wrong. I want to override or prevent the actions the auto merge wants to do. How do I do that?

[psantosl]

You mean some of the conflicts were automatically solved and others not, and some of the automatic are not ok?

[Brett]

I had 4 conflicts to solve myself, which were just folders. And then the auto merge tab had more than a thousand but the action it would take is wrong. I want to prevent it from being auto merged and want all those to appear on the manual conflict resolution tab so I can set them correctly.

 

Also related, how do I know which is source and which is destination? It's really confusing right now because in a given changeset you may need to resolve server conflicts and it's not clear if source means server or local and vice-versa for destination. Any window that has that should substitute the names in or put in brackets which direction it's going to be really sure. 

[psantosl]

Ok, I'd have to take a look into those automatic conflicts, since I understand they are at directory level. If so, normally automatic ones means there's really no possible human intervention, they are just discarded based on the merge logic. But I'd have to look into it.

 

Regarding the source/destination: here is the best explanation we have:

Then a full chapter about it

https://www.plasticscm.com/book/#_merge_contributors_source_destination_and_base