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

"Parent of" sticks around after resolving conflict #42

Open
alok opened this issue Jul 16, 2018 · 1 comment
Open

"Parent of" sticks around after resolving conflict #42

alok opened this issue Jul 16, 2018 · 1 comment
Labels
bug

Comments

@alok
Copy link

alok commented Jul 16, 2018

The ||||| marker isn't removed when the conflict is resolved and ends up in the codebase.
@mkchoi212 mkchoi212 added the bug label Jul 18, 2018
@mkchoi212
Copy link
Owner

Sorry for the really late reply but need a sample file where this happens. Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
bug
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@mkchoi212 @alok