Skip to content

Allow to open the merge editor in files with conflict markers #155472

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
Closed
hediet opened this issue Jul 18, 2022 · 2 comments
Closed

Allow to open the merge editor in files with conflict markers #155472

hediet opened this issue Jul 18, 2022 · 2 comments
Assignees
@jrieken @hediet
Labels
*duplicate Issue identified as a duplicate of another issue(s) merge-editor
Milestone
July 2022

Comments

@hediet
Copy link
Member

hediet commented Jul 18, 2022

No description provided.

@hediet hediet added feature-request Request for new features or functionality merge-editor labels Jul 18, 2022
@hediet hediet added this to the July 2022 milestone Jul 18, 2022
@jrieken
Copy link
Member

jrieken commented Jul 18, 2022

same as #153800?

@hediet
Copy link
Member Author

hediet commented Jul 18, 2022

Closing as duplicate.

@hediet hediet closed this as completed Jul 18, 2022
@hediet hediet added *duplicate Issue identified as a duplicate of another issue(s) and removed feature-request Request for new features or functionality labels Jul 18, 2022
@kieferrm kieferrm mentioned this issue Jul 18, 2022
Closed
98 tasks
@github-actions github-actions bot locked and limited conversation to collaborators Sep 1, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees

@jrieken jrieken

@hediet hediet

Labels
*duplicate Issue identified as a duplicate of another issue(s) merge-editor
Projects
None yet
Milestone
July 2022
Development

No branches or pull requests
2 participants
@jrieken @hediet