microsoft / microsoft/vscode-pull-request-github
'Complete Merge' button hidden behind notification toast
Nobody has claimed this yet.
- Dominant language
- TypeScript
- Stars
- 2.6k
- Forks
- 796
- Avg merge
- 1d 4h
- Merged PRs (30d)
- 46
Description
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.
Contributor guide
No contributing guide indexed for this repository
First steps
- Read the whole issue, then the project's contributing guide.
- Comment on the issue to say you are picking it up — it saves two people doing the same work.
- Fork the repository and make your change on a branch.
- Open a pull request that references the issue number.
Research direction
Reproduce the conflict-resolution flow in VS Code by opening a pull request, selecting Resolve Conflicts, and observing the notification toast in the merge editor. Trace the merge editor and notification layout from the relevant extension entry points; done means the Complete Merge button remains accessible without cancelling the notification or resizing panes.
Written by the indexing model from the issue text.
Assessment
- Tech stack
- typescript
- Domain
- frontend
- Issue type
- Bug
- Difficulty
- 3/5
- Estimated time
- 1-2 days
- Activity status
- Quiet
- Clarity
- Mostly clear
- Newbie friendliness
- 58/100