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,

and now I found the original discussion. Please look around this
thread: http://dev.eclipse.org/mhonarc/lists/jgit-dev/msg00789.html .
In this thread I am describing the problem and Shawn tells that he was
talking to Junio about that. Native git seems to take all the context
lines of a change (for me +3 lines before and after the changed lines)
as important to detect conflicts.

Ciao
  Chris


Back to the top