[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
RE: [egit-dev] Re: JGit merge algorithm (fwd)
|
Hi,
thanks Johannes for this very helpful comments. They made me think again about how we report the merge result and brought some simplifications. After a lot of back and forth I am now happy with one proposal which I published at http://egit.eclipse.org/r/#change,140. Please have a look. If you register you can even directly comment in the code.
One question is still not so clear to me, maybe somebody knows. Should the merge result contain references to the common base? One could easily present the results of the merge just by copying ranges of text from "ours" or "theirs". No need to refer to the common base text. On the other hand I would like to express in the merge result where we have areas which are common to both merged texts. In the current proposal this is expressed by having merge chunks which refer back to the common base text. Any comments on this?
Ciao
Chris
