From: Rogan Dawes Date: Sat, 21 Feb 2009 11:12:37 GMT Subject: Re: merge smart enough to adapt to renames? Message-ID: <499FE1A5.9020301@dawes.za.net> In-Reply-To: Kris Shannon wrote: > Rogan Dawes wrote: >> It seems to me that git is smart enough to figure out where contents get >> moved to, once. Of course, if you have conflicting moves in the same >> repo, git's automation falls down. So, if you need to move the "same" >> file in different repositories to different places, you need to do it >> via an intermediate repo that will be able to "remember" which movement >> you chose. > > You don't need a whole different repo, branches are good enough. > Yes, of course. Rogan