Re: [PATCH v3 4/8] merge-recursive: new function for better colliding conflict resolutions

2018-11-01 Thread Elijah Newren
On Wed, Oct 31, 2018 at 6:57 AM Derrick Stolee wrote: > > On 10/31/2018 9:53 AM, Derrick Stolee wrote: > > On 10/19/2018 3:31 PM, Elijah Newren wrote: > >> +#if 0 // #if-0-ing avoids unused function warning; will make live in > >> next commit > >> +static int handle_file_collision(struct

Re: [PATCH v3 4/8] merge-recursive: new function for better colliding conflict resolutions

2018-10-31 Thread Derrick Stolee
On 10/31/2018 9:53 AM, Derrick Stolee wrote: On 10/19/2018 3:31 PM, Elijah Newren wrote: +#if 0 // #if-0-ing avoids unused function warning; will make live in next commit +static int handle_file_collision(struct merge_options *o, + const char *collide_path, +

Re: [PATCH v3 4/8] merge-recursive: new function for better colliding conflict resolutions

2018-10-31 Thread Derrick Stolee
On 10/19/2018 3:31 PM, Elijah Newren wrote: +#if 0 // #if-0-ing avoids unused function warning; will make live in next commit +static int handle_file_collision(struct merge_options *o, +const char *collide_path, +const char

[PATCH v3 4/8] merge-recursive: new function for better colliding conflict resolutions

2018-10-19 Thread Elijah Newren
There are three conflict types that represent two (possibly entirely unrelated) files colliding at the same location: * add/add * rename/add * rename/rename(2to1) These three conflict types already share more similarity than might be immediately apparent from their description: (1) the