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, but
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.
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
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-merge-base
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.
I first checked out your 702c7e.. commit, and slurped Linus tip
(back
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.
I first
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 merge
7 matches
Mail list logo
