Ben Clifford <benc@hawaga.org.uk> writes: > $ ls > bar > $ git ls-files -d > FOO > $ git ls-tree HEAD > 100644 blob b7d6715e2df11b9c32b2341423273c6b3ad9ae8a FOO > 100644 blob 5f8b81e197a2cb27816112fb5a6b86b7031ffde8 bar > > The checkout is losing the FOO file but the merged tree object has the > merged FOO in it. That's interesting. I wonder how... Does this sequence remove FOO on that filesystem? $ date >FOO $ rm -f foo $ ls Also if you do the final "git pull" using resolve strategy, does it change the result (say "git pull -s resolve . side" instead)? - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Wed May 24 11:41:31 2006
This archive was generated by hypermail 2.1.8 : 2006-05-24 11:41:50 EST