Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Conflict notification blocks 'Open in Merge Editor' button #162037

Closed
daviddossett opened this issue Sep 27, 2022 · 2 comments · Fixed by #167265
Closed

Conflict notification blocks 'Open in Merge Editor' button #162037

daviddossett opened this issue Sep 27, 2022 · 2 comments · Fixed by #167265
Assignees
@jrieken @hediet @lszomoru @daviddossett
Labels
git GIT issues insiders-released Patch has been released in VS Code Insiders merge-editor polish Cleanup and polish issue
Milestone
November 2022

Comments

@daviddossett
Copy link
Contributor

Testing #161833

Related to #153712, this notification blocks the button. Many users may never close it and will never see the merge editor button.

CleanShot 2022-09-27 at 11 25 23@2x
@hediet hediet added this to the September 2022 milestone Sep 28, 2022
@hediet hediet added polish Cleanup and polish issue merge-editor labels Sep 28, 2022
@jrieken jrieken modified the milestones: September 2022, October 2022 Sep 29, 2022
@jrieken jrieken added the git GIT issues label Oct 24, 2022
@jrieken jrieken removed this from the October 2022 milestone Oct 24, 2022
@jrieken
Copy link
Member

jrieken commented Oct 24, 2022

Adding @lszomoru because this message isn't something the 3wm editor controls but something that comes out of git itself

@lszomoru lszomoru added this to the November 2022 milestone Oct 24, 2022
@jrieken jrieken mentioned this issue Nov 25, 2022
Merged
@jrieken
Copy link
Member

jrieken commented Nov 25, 2022

With #167265 I have added another option that allows user to show the SCM view/changes so that they can (1) get rid of the notification and (2) have a way to see all conflicts to handle them

jrieken added a commit that referenced this issue Nov 25, 2022
@jrieken
Give an option to show changes (SCM view) when encountering a merge c…
a04861f 
…onflict

fixes #162037
jrieken added a commit that referenced this issue Nov 25, 2022
@jrieken
Give an option to show changes (SCM view) when encountering a merge c…
e7edf6e 
…onflict (#167265)

fixes #162037
@vscodenpa vscodenpa added unreleased Patch has not yet been released in VS Code Insiders insiders-released Patch has been released in VS Code Insiders and removed unreleased Patch has not yet been released in VS Code Insiders labels Nov 25, 2022
@github-actions github-actions bot locked and limited conversation to collaborators Jan 9, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees

@jrieken jrieken

@hediet hediet

@lszomoru lszomoru

@daviddossett daviddossett

Labels
git GIT issues insiders-released Patch has been released in VS Code Insiders merge-editor polish Cleanup and polish issue
Projects
None yet
Milestone
November 2022
Development

Successfully merging a pull request may close this issue.

Give an option to show changes (SCM view) when encountering a merge conflict microsoft/vscode
5 participants
@jrieken @hediet @lszomoru @daviddossett @vscodenpa