From: H. Peter Anvin <hpa@zytor.com>
Date: Sat, 12 May 2007 00:35:11 GMT
Subject: Re: git rebase chokes on directory -> symlink -> directory
Message-ID: <46450BBF.5020900@zytor.com>
In-Reply-To: <7vps569904.fsf@assigned-by-dhcp.cox.net>

Junio C Hamano wrote:
> "H. Peter Anvin" <hpa@zytor.com> writes:
> 
>> Mine stops already at the directory -> symlink checkin (the above is the
>> symlink -> directory one), but your trick of using "git checkout" as a
>> trick to resolve things helped for both... eventually :-/
> 
> I've tried to redo your rebase using:
> 
> 	apply: do not get confused by symlinks in the middle
> 
> patch on top of 'master'.  It successfully run through the end.
> 
> So I think I can declare victory for now ;-).
> 

YAY!  Huge thanks!

	-hpa