'Complete Merge' button hidden behind notification toast

When you're in a PR and you have conflicts and you click the 'Resolve Conflicts' button

it brings up the merge editor with a notification type toast saying what is happening

Problem is, that toast covers the 'complete merge' button. If you 'cancel' that notification type piece, you go right back out of the view.

You have to do some acrobatics of window resizing or splitpaning etc to get to the 'complete merge' button.

通过打开 pull request、选择 Resolve Conflicts 并观察 merge editor 中的通知 toast，复现 VS Code 中的冲突解决流程。从相关 extension 入口追踪 merge editor 和通知的布局；完成的标准是 Complete Merge 按钮保持可访问，无需取消通知或调整窗格大小。