On Tue, Feb 24, 2009 at 1:31 AM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > > $ git cat-file blob :1:profiles/package.mask >original > $ git cat-file blob :3:profiles/package.mask >theirs > $ git cat-file blob profiles/package.mask/frotz >mine > $ git merge-file mine original theirs > $ diff -u profiles/package.mask/frotz mine ;# eyeball the merge result > $ cat mine >profiles/package.mask/frotz so do all this if theirs is different? (at the moment I know it isn't) > and then finally conclude the merge with: > > $ git rm profiles/package.mask > $ git add profiles/package.mask/frotz git rm profiles/package.mask rm 'profiles/package.mask' rm 'profiles/package.mask' rm 'profiles/package.mask/gentoo.org' rm 'profiles/package.mask/java-overlay' rm 'profiles/package.mask/perl-experimental' rm 'profiles/package.mask/regen2.org' rm 'profiles/package.mask/sunrise' fatal: git rm: profiles/package.mask: Is a directory and git status still shows.. # unmerged: profiles/package.mask -- Caleb Cushing http://xenoterracide.blogspot.com -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
