If you are using VSCode 1.69 (June 2020) or more, there is a new merge view, which allows a side-by-side resolution .
But as a result, the old merge conflict decorators are no longer there.
Setting git.mergeEditor
to false
might help you to revert to the old behavior.
The technical post webpages of this site follow the CC BY-SA 4.0 protocol. If you need to reprint, please indicate the site URL or the original address.Any question please contact:yoyou2525@163.com.