From: David Euresti Date: Tue, 18 Sep 2007 22:42:39 GMT Subject: Re: Problem with merge when renaming Message-ID: <95b3d0af0709181542s43cd55c1xb0e653be4c030dab@mail.gmail.com> In-Reply-To: <7v7imnvca0.fsf@gitster.siamese.dyndns.org> 1) git version 1.5.2.5 and 1.5.3.1.139.g9346b 2) $ git-merge -s resolve branch-a $ git-merge -s resolve branch-b Trying really trivial in-index merge... fatal: Merge requires file-level merging Nope. Trying simple merge. Simple merge failed, trying Automatic merge. fatal: merge program failed Automatic merge failed; fix conflicts and then commit the result. $ git status # On branch master # Changes to be committed: # (use "git reset HEAD ..." to unstage) # # new file: bar.txt # new file: foo.txt # # Changed but not updated: # (use "git add ..." to update what will be committed) # # unmerged: dir/foo # unmerged: dir/foo/foo.bin # modified: dir/foo/foo.bin # But if I do it in the other order I get this: $ git-merge -s resolve branch-b $ git-merge -s resolve branch-a Trying really trivial in-index merge... fatal: Merge requires file-level merging Nope. Trying simple merge. Simple merge failed, trying Automatic merge. Removing dir/foo Adding dir/foo/foo.bin ERROR: untracked dir/foo/foo.bin is overwritten by the merge. fatal: merge program failed Automatic merge failed; fix conflicts and then commit the result. deuresti@deuresti-lnx /tmp/scm-rename-test/git-repo $ git status # On branch master # Changes to be committed: # (use "git reset HEAD ..." to unstage) # # deleted: dir/foo # # Changed but not updated: # (use "git add ..." to update what will be committed) # # unmerged: dir/foo/foo.bin # Thanks, David On 9/18/07, Junio C Hamano wrote: > "David Euresti" writes: > > > I think I found a problem when you move a file into a directory of the > > same name. Here's what I did. > > Two questions. > > (1) git --version? > > (2) if you do "git merge -s resolve" instead of just "git > merge", do you see a difference? >