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

Code lenses for resolving conflicts is not visible in the merge editor #151020

Closed
karrtikr opened this issue Jun 1, 2022 · 3 comments
Closed

Code lenses for resolving conflicts is not visible in the merge editor #151020

karrtikr opened this issue Jun 1, 2022 · 3 comments
Assignees
@jrieken @hediet
Labels
*as-designed Described behavior is as designed

Comments

@karrtikr
Copy link
Contributor

karrtikr commented Jun 1, 2022 •
edited
Loading

Testing #150389

Expected:
image

Actual:
image

you can select "Accept Merge" so that the file is staged and the merge editor is closed

Also when we select accept merge, changes are staged along with the merge conflicts without a warning prompt. (created #151024)
@karrtikr
Copy link
Contributor Author

karrtikr commented Jun 1, 2022

If this is as designed feel free to close the issue.

@hediet hediet added the *as-designed Described behavior is as designed label Jun 2, 2022
@vscodenpa
Copy link

The described behavior is how it is expected to work. If you disagree, please explain what is expected and what is not in more detail. See also our issue reporting guidelines.

Happy Coding!

@hediet
Copy link
Member

hediet commented Jun 2, 2022

This is as designed. Even more, we also want to remove the marge marker decoration alltogether.

@github-actions github-actions bot locked and limited conversation to collaborators Jul 17, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees

@jrieken jrieken

@hediet hediet

Labels
*as-designed Described behavior is as designed
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
4 participants
@jrieken @hediet @karrtikr @vscodenpa