Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [jgit-dev] Eliminating merge conflicts for adjacent/contiguous blocks?

Hi,

my first implementation of the merge algorithm was really doing like
you suggest. But then I learned: this is not how native git behaves
and one of our goals in JGit is to be functionality wise as close as
possible to native git. I tried your example with native git and it
gives a conflict:

0: master
<<<<<<< HEAD
1:
2: branch2: change
=======
1: branch1: change
2:
>>>>>>> branch1
3: master

The commit where I explicitly switched to the native git behaviour is
https://git.eclipse.org/c/jgit/jgit.git/commit/?id=99771f04bcb6b1a79d4b9c5edff21c994104f8da
. The commit contains also some test cases which fail without the new
behaviour.

Ciao
  Chris


Back to the top