John Murray

I'm getting some stickiness in XML that I'm testing with the current 1.71 Insiders, so something is changing in this area. @aiday-mar can you share any information yet about this?

You need to be using Insiders edition. Download it from https://code.visualstudio.com/insiders/ You can install it alongside the general release version, aka Stable.

Excellent! 1.71 is expected to ship in early September. See #157454.

What are your settings for `git.mergeEditor` and `diffEditor.codeLens`?

To return to the pre-1.70 behaviour you need to set git.mergeEditor false and maybe also set diffEditor.codeLens true. Some people have also reported that they needed to restart VS Code...

Have you set the `git.mergeEditor` setting?

@djc are you able to test with Insiders. Endgame started on Monday, so 1.70 ought to ship by the end of next week. I think it contains some fixes for...

Maybe #156642

I have seen several similar issues. Maybe if sticky headers were editor insets / ViewZones rather than overlay widgets they would all go away.

Did you notice https://code.visualstudio.com/updates/v1_70#_shell-integration-enabled-by-default?