Until recently, in VSCode, handling merge conflicts was simple (to me, at least):
- Accept Current Change,
- Accept Incoming Change,
- Accept Both Changes,
- Compare Changes.
It used to be something like this:
However, from v1.70 onwards, it's been updated. See v1.70 release notes
Now, it looks something like this:
At this point, I don't like this new view. So, how can I turn it off and change it back to the original one?
