We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
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
I tried to merge the following scenario:
base: {} left: {a} right: {} {b}
This is what I want to happen:
base: {} left: {a} right: {} {b} merged: {a} {b} + ++++
Instead a merge conflict happens because the following two blocks ends up being connected and compared:
+ {a} {} {b} ++++
The expected outcome would merge cleanly, whereas the second will generate a merge conflict.
I need to see if I can make the diff/merge algorithm less greedy in this case.
The text was updated successfully, but these errors were encountered:
Fixes issue #19: Add support for options so that the Patience optimiz…
f216281
…ation can be disabled for merges
The solution for now is to disable the patience optimization when merging as this removes information useful for synchronizing points in the code.
Sorry, something went wrong.
7a6a6d5
No branches or pull requests
I tried to merge the following scenario:
This is what I want to happen:
Instead a merge conflict happens because the following two blocks ends up being connected and compared:
The expected outcome would merge cleanly, whereas the second will generate a merge conflict.
I need to see if I can make the diff/merge algorithm less greedy in this case.
The text was updated successfully, but these errors were encountered: