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.

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

Gutter marks linger after edits #18

Open
michaelblyons opened this issue Jan 11, 2018 · 0 comments
Open

Gutter marks linger after edits #18

michaelblyons opened this issue Jan 11, 2018 · 0 comments

Comments

@michaelblyons
Copy link

If I fix a merge conflict by hand, the highlighting outline recognizes that the conflict no longer exists. The gutter icons, however, stick around. Save the following file:

If you have questions, please
<<<<<<< HEAD
open an issue.
|||||||
don't worry about it.
=======
ask your question in IRC.
>>>>>>> branch-a

Then, delete and edit lines1 so it says:

If you have questions, please
open an issue and
ask your question in IRC.

The UI for lines 2-3 will still retain their arrows, kind of like this:

 1 If you have questions, please
←2 open an issue and
→3 ask your question in IRC.

I'd like it if the gutter was cleaned up along with the highlighting.


1 If you just paste the text overtop instead of manually editing, the gutter behavior is slightly different, but still leaves a stray .

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant