Linus Torvalds <[EMAIL PROTECTED]> writes:
> Ok, I think your approach is the correct one. Just list all the commits,
> and let the merge logic figure out which one is the best one.
>
> Just returning several entries is the correct thing to do, because then
> you can make the distance function be
On Tue, 23 Aug 2005, Junio C Hamano wrote:
> Only lightly tested, in the sense that I did only this one case
> and nothing else. For a large repository and with complex
> merges, "merge-base -a" _might_ end up reporting many
> candidates, in which case the pre-merge step to figure out the
> best
tainly chose the right ancestor in this case.
> Simple merge failed, trying Automatic merge
> Auto-merging Documentation/acpi-hotkey.txt.
> merge: warning: conflicts during merge
> ERROR: Merge conflict in Documentation/acpi-hotkey.txt.
> Auto-merging drivers/acpi/os
On Tue, 23 Aug 2005, Junio C Hamano wrote:
>
> Only lightly tested, in the sense that I did only this one case
> and nothing else. For a large repository and with complex
> merges, "merge-base -a" _might_ end up reporting many
> candidates, in which case the pre-merge step to figure out the
> b
t.
Auto-merging drivers/acpi/osl.c.
fatal: merge program failed
Automatic merge failed, fix up by hand
Only lightly tested, in the sense that I did only this one case
and nothing else. For a large repository and with complex
merges, "merge-base -a" _might_ end up reporting many
On Tue, 23 Aug 2005, Len Brown wrote:
>
> 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.
Cool.
You've found a case where git-merg
Junio C Hamano <[EMAIL PROTECTED]> writes:
> I think merge-base, even though we attempted to fix it recently,
> is still confused and that is one of the reasons why you are
> getting this.
>
> prompt$ git-rev-parse origin test-lenb-merge
> 81065e2f415af6c028eac13f481fb9e60a0b487b
> 70
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 would help me diagnose the problem a lot.
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 would help me diagnose the problem a lot.
>
> rsync://rsync.kernel.org/pub/scm/linux/kernel/git/lenb/to-akpm.
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 working tree? It seems
> to me that what is happenning
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 working tree? It seems
to me that what is happenning is the resolve is trying to merge
the head of your tree and from-linus
ing sound/ppc/pmac.c.
fatal: merge program failed
Automatic merge failed, fix up by hand
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
12 matches
Mail list logo