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

Potentially "incorrect" merge (diff?) behavior related to similar code #19

Open
lassevk opened this issue Jul 26, 2017 · 1 comment
Open

Comments

@lassevk
Copy link
Owner

lassevk commented Jul 26, 2017

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.

lassevk pushed a commit that referenced this issue Jul 27, 2017
@lassevk
Copy link
Owner Author

lassevk commented Jul 27, 2017

The solution for now is to disable the patience optimization when merging as this removes information useful for synchronizing points in the code.

lassevk added a commit that referenced this issue Aug 15, 2017

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
…ation can be disabled for merges
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