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

MINE conflict marker not in its own line #160

Open
leonardoAnjos16 opened this issue Jul 30, 2021 · 0 comments
Open

MINE conflict marker not in its own line #160

leonardoAnjos16 opened this issue Jul 30, 2021 · 0 comments
Labels

Comments

@leonardoAnjos16
Copy link
Collaborator

Sometimes, after the execution of the deletion and renaming handler, crucial information about blank lines between method declarations get lost. If the tool identifies a conflict between two declarations of the same method, this may cause the output to have the MINE conflict marker (<<<<<<< MINE) appearing in the end of some line, instead of being in a line of its own.

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

No branches or pull requests

1 participant