File Introduced as Both a Largefile and Regular File?

[Jason Harris]

On Nov 4, 2011, at 3:15 PM, Na'Tosha Bard wrote:

> OK, so after some more investigation into this issue, I propose that we solve the problem like this:
> 
> Check for conflicting largefiles vs. regular files in both heads before attempting to merge.  Abort the merge if such a conflict is found, explaining to the user that they need to modify one of the heads to fix the conflict before continuing the merge.

This choice would be more compatible with GUI clients (such as MacHg) which often have --noninteractive set. Also, I would think, the user would almost always have to correct one of the heads...

Cheers,
   Jas

> Does this seem reasonable?
> 
> Another possibility would be to provide a "pick local or other" question in this instance.
> 
> Cheers,
> Na'Tosha