Re: Trouble merging renamed but identical files - CONFLICT (rename/rename)

On Fri, Jun 27, 2014 at 6:39 PM, Jason Pyeron jpye...@pdinc.us wrote: On Fri, Jun 27, 2014 at 4:47 PM, Jason Pyeron jpye...@pdinc.us wrote: There are two identical files from the same original parent, but both were renamed in their own branches. One branch moved the file to a new folder,

Re: Trouble merging renamed but identical files - CONFLICT (rename/rename)

On Fri, Jun 27, 2014 at 8:42 PM, Jason Pyeron jpye...@pdinc.us wrote: Sorry for the http://pastebin.com/1R68v6jt (changes the merge to 1ca13ed2271d60ba93d40bcc8db17ced8545f172, and manually reconciles the merge), but it was too long to be readable in the email. git blame HEAD --

Re: Trouble merging renamed but identical files - CONFLICT (rename/rename)

On Sun, Jun 29, 2014 at 11:31 AM, Phil Hord phil.h...@gmail.com wrote: On Fri, Jun 27, 2014 at 8:42 PM, Jason Pyeron jpye...@pdinc.us wrote: Sorry for the http://pastebin.com/1R68v6jt (changes the merge to 1ca13ed2271d60ba93d40bcc8db17ced8545f172, and manually reconciles the merge), but it was

RE: Trouble merging renamed but identical files - CONFLICT (rename/rename)

-Original Message- From: Phil Hord Sent: Sunday, June 29, 2014 16:09 On Sun, Jun 29, 2014 at 11:31 AM, Phil Hord phil.h...@gmail.com wrote: On Fri, Jun 27, 2014 at 8:42 PM, Jason Pyeron jpye...@pdinc.us wrote: Sorry for the http://pastebin.com/1R68v6jt (changes the merge to

Re: Trouble merging renamed but identical files - CONFLICT (rename/rename)

On Sun, Jun 29, 2014 at 4:20 PM, Jason Pyeron jpye...@pdinc.us wrote: -Original Message- From: Phil Hord Sent: Sunday, June 29, 2014 16:09 On Sun, Jun 29, 2014 at 11:31 AM, Phil Hord phil.h...@gmail.com wrote: On Fri, Jun 27, 2014 at 8:42 PM, Jason Pyeron jpye...@pdinc.us wrote:

RE: Trouble merging renamed but identical files - CONFLICT (rename/rename)

-Original Message- From: Phil Hord Sent: Sunday, June 29, 2014 16:27 On Sun, Jun 29, 2014 at 4:20 PM, Jason Pyeron jpye...@pdinc.us wrote: -Original Message- From: Phil Hord Sent: Sunday, June 29, 2014 16:09 On Sun, Jun 29, 2014 at 11:31 AM, Phil Hord

Re: Trouble merging renamed but identical files - CONFLICT (rename/rename)

On Sun, Jun 29, 2014 at 5:13 PM, Jason Pyeron jpye...@pdinc.us wrote: -Original Message- From: Phil Hord Sent: Sunday, June 29, 2014 16:27 On Sun, Jun 29, 2014 at 4:20 PM, Jason Pyeron jpye...@pdinc.us wrote: -Original Message- From: Phil Hord Sent: Sunday, June 29,

RE: Trouble merging renamed but identical files - CONFLICT (rename/rename)

-Original Message- From: Jason Pyeron Sent: Friday, June 27, 2014 20:42 To: 'git' Cc: 'Phil Hord' Subject: RE: Trouble merging renamed but identical files - CONFLICT (rename/rename) -Original Message- From: Jason Pyeron Sent: Friday, June 27, 2014 18:39

Re: Trouble merging renamed but identical files - CONFLICT (rename/rename)

On Fri, Jun 27, 2014 at 4:47 PM, Jason Pyeron jpye...@pdinc.us wrote: There are two identical files from the same original parent, but both were renamed in their own branches. One branch moved the file to a new folder, the other renamed the file in the same folder. You have not stated what you

RE: Trouble merging renamed but identical files - CONFLICT (rename/rename)

-Original Message- From: Phil Hord [mailto:phil.h...@gmail.com] Sent: Friday, June 27, 2014 17:46 To: Jason Pyeron Cc: git Subject: Re: Trouble merging renamed but identical files - CONFLICT (rename/rename) On Fri, Jun 27, 2014 at 4:47 PM, Jason Pyeron jpye...@pdinc.us wrote

RE: Trouble merging renamed but identical files - CONFLICT (rename/rename)

-Original Message- From: Jason Pyeron Sent: Friday, June 27, 2014 18:39 -Original Message- From: Phil Hord [mailto:phil.h...@gmail.com] Sent: Friday, June 27, 2014 17:46 To: Jason Pyeron Cc: git Subject: Re: Trouble merging renamed but identical files