Skip to content
This repository has been archived by the owner on Nov 8, 2017. It is now read-only.

Merge-Conflicts Highlighted Text #131

Closed
ahightman opened this issue Mar 23, 2015 · 1 comment · Fixed by #136
Closed

Merge-Conflicts Highlighted Text #131

ahightman opened this issue Mar 23, 2015 · 1 comment · Fixed by #136
Milestone
1.3.1

Comments

@ahightman
Copy link

After resolving merge-conflicts, staging commit, pushing, the conflicted text stays highlighted no matter what I do.
@smashwilson
Copy link
Owner

Oh hey, you're absolutely right. I usually close and re-open my open editors to clear them, but the right thing to do would be to clean up all of the live markers and decorations when the didQuitConflictResolution or didCompleteConflictResolution are emitted.

I'll have a look and see if I can get this working properly for 1.3.1.

@smashwilson smashwilson added this to the 1.3.1 milestone Apr 11, 2015
@smashwilson smashwilson mentioned this issue Apr 11, 2015
Merged
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
1.3.1
Development

Successfully merging a pull request may close this issue.

Clean up resolved markers smashwilson/merge-conflicts
2 participants
@smashwilson @ahightman