Accept current change does not remove <<<< HEAD markup

[caliniaru]

A merge or rebase command does show inline differences in source files as expected. Sporadically, clicking on "Accept current change" or "Accept incoming change" button above the difference does leave behind the "<<<<<<<< HEAD" or "========" delimiter. The issue surfaces more often with this version.

[vscodebot]

(Experimental duplicate detection)
Thanks for submitting this issue. Please also check if it is already covered by an existing one, like:

• Accept all current change option while merging (#128325)

[eamodio]

/gifPlease

[caliniaru]

Hi Eric, It will be difficult to capture. I will keep it in mind. Regards, Calin From: Eric ***@***.***> Sent: Wednesday, September 15, 2021 08:38 To: ***@***.***> Cc: ***@***.***>; ***@***.***> Subject: Re: [microsoft/vscode] Accept current change does not remove <<<< HEAD markup (#131067) /gifPlease — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub<#131067 (comment)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/AKICTVCVWODV3HJWADNRICDUCAWN3ANCNFSM5CLPGQRQ>. Triage notifications on the go with GitHub Mobile for iOS<https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675> or Android<https://play.google.com/store/apps/details?id=com.github.android&referrer=utm_campaign%3Dnotification-email%26utm_medium%3Demail%26utm_source%3Dgithub>.