I'm using Visual Studio Code with Git.
I've noticed that whenever I have a merge conflict, and the "Accept Combination" resolution is available, is available, it always does the correct and obvious thing.
Is there any way to just make it happen by default, so it doesn't even bother me with merge "conflicts" that can be resolved by "Accept Combination?"