-
Notifications
You must be signed in to change notification settings - Fork 37.4k
Description
Version: 1.43.2 (system setup)
Commit: 0ba0ca5
Date: 2020-03-24T07:38:38.248Z
Electron: 7.1.11
Chrome: 78.0.3904.130
Node.js: 12.8.1
V8: 7.8.279.23-electron.0
OS: Windows_NT x64 10.0.18362
Steps to Reproduce:
Markdown files which use ==== to indicate titles cause vscode to detect the markdown markup, rather than the git merge conflict separator as the break for the merge.

In this example, vscode detected the blue group of equals signs as the separator between the merge conflicts. However, it should have used the later entry at the red arrow.
Selecting the vscode option "Accept Current Change" would thus, only include a subset of the the current change, while selecting "Accept Incoming Change" would bring along some of the current change set.
The detection of git merge should thus only look for exactly 7 equal signs followed by the end of line ^=======$
Does this issue occur when all extensions are disabled?: Yes