I'm having trouble using git for merging kernel trees.
git seems to manufacture conflicts in files that
I never touched, and on some files it completely
throws up its arms, see "Not handling case" below.
Not clear how I got into this state -- probably
something to do with adding commits on branch
On Tue, 2005-08-23 at 18:06 -0400, Junio C Hamano wrote:
> Len Brown <[EMAIL PROTECTED]> writes:
>
> > The merge issue below is reproduced in a "git clone -l" copy
> > with no plain files present.
>
> Meaning you did not have any file in the work
On Tue, 2005-08-23 at 19:58 -0400, Junio C Hamano wrote:
> Len Brown <[EMAIL PROTECTED]> writes:
>
> >> I could get to 81065e2f415af6... commit (Linus tip at this
> >> moment), so if you can tell me where to snarf the other commit
> >> (702c7e76) that w
On Tue, 2005-08-23 at 21:07 -0400, Junio C Hamano wrote:
> Junio C Hamano <[EMAIL PROTECTED]> writes:
>
> > Probably the ideal way would be to give merge-base an option to
> > spit out all the candidates, and have the script try to see
> > which ones yield the least number of non-trivial merges.
>
4 matches
Mail list logo
