From: Junio C Hamano Date: Tue, 13 Nov 2012 23:41:10 GMT Subject: Re: checkout from neighbour branch undeletes a path? Message-ID: <7vbof1cbqh.fsf@alter.siamese.dyndns.org> In-Reply-To: <20121113152341.GC6561@external.screwed.box> Peter Vereshagin writes: > $ rm -r pathdir > $ git checkout branch00 pathdir > $ find pathdir/ > pathdir/ > pathdir/file00.txt > pathdir/file01.txt > $ Hasn't this been fixed at 0a1283b (checkout $tree $path: do not clobber local changes in $path not in $tree, 2011-09-30)? Are you using 1.7.7.1 or newer? If not, please upgrade.