On Sat, Sep 27, 2008 at 04:16:29PM +0200, Thomas Rast <trast@xxxxxxxxxxxxxxx> wrote: > * Setup: > > mkdir $temp_repo > cd $temp_repo > git init > echo foo > foo > git add foo > git commit -m initial > echo a > foo > git commit -m a foo > git checkout -b side HEAD^ > echo b > foo > git commit -m b foo > git checkout master Oh, the racy git problem. ;-) $ git reset --hard; touch foo; git merge side HEAD is now at 5bafc63 a Auto-merging foo CONFLICT (content): Merge conflict in foo Automatic merge failed; fix conflicts and then commit the result. $ git reset --hard; sleep 1; touch foo;git merge side HEAD is now at 5bafc63 a error: Entry 'foo' not uptodate. Cannot merge. fatal: merging of trees 86de5e13286a8449a8a706a58e63be6781770b12 and 9ee610433fb8854e497d62c648a612b5deb090cf failed Thanks for the reproducer, I'll write a proper testcase for this and try to provide a fix for it as well.
Attachment:
pgpfyrVLvydZC.pgp
Description: PGP signature
