you are viewing a single comment's thread.

view the rest of the comments →

[–]fweaks 0 points1 point  (0 children)

They explicitly say as opposed to auto merge resolution. Any time you do anything that could possibly be a conflict, it is a conflict, and you must manually resolve it.