Re: Rename edge case...

On Fri, Nov 9, 2012 at 11:09 AM, Jeff King wrote: [snip] > Right. If the source didn't go away, it would be a copy. We can do copy > detection, but it is not quite as obvious what a merge should do with a > copy (apply the change to the original? To the copy? In both places? You > would really wan

Re: Rename edge case...

On Fri, Nov 09, 2012 at 04:10:31AM -0500, John Szakmeister wrote: > I've been browsing StackOverflow answering git-related questions, and > ran across this one: > > > It's a bit of an interesting situation. The user did

Re: Rename edge case...

Am 11/9/2012 11:25, schrieb John Szakmeister: > On Fri, Nov 9, 2012 at 4:27 AM, Tomas Carnecky > wrote: > [snip] >> When merging two branches, git only looks at the tips. It doesn't inspect >> their histories to see how the files were moved around. So i doesn't matter >> whether you rename the fi

Re: Rename edge case...

On Fri, Nov 9, 2012 at 5:25 PM, John Szakmeister wrote: > On Fri, Nov 9, 2012 at 4:27 AM, Tomas Carnecky > wrote: > [snip] >> When merging two branches, git only looks at the tips. It doesn't inspect >> their histories to see how the files were moved around. So i doesn't matter >> whether you re

Re: Rename edge case...

On Fri, Nov 9, 2012 at 4:27 AM, Tomas Carnecky wrote: [snip] > When merging two branches, git only looks at the tips. It doesn't inspect > their histories to see how the files were moved around. So i doesn't matter > whether you rename the files in a single commit or multiple commits. The > result

Re: Rename edge case...

On Fri, 09 Nov 2012 04:10:31 -0500, John Szakmeister wrote: > I've been browsing StackOverflow answering git-related questions, and > ran across this one: > > > It's a bit of an interesting situation. The user did a cou

Rename edge case...

I've been browsing StackOverflow answering git-related questions, and ran across this one: It's a bit of an interesting situation. The user did a couple of renames in a branch: foo.txt => fooOld.txt fooNew.txt =>