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.
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.