[cvsnt] Why is this a conflict?

[Jeff Urlwin]

> 
> Jeff Urlwin wrote:
> 
> > to the tool, as the line numbers would be the same.  Maybe 
> it should 
> > be a special case when the changes are after the last line 
> number on 
> > the previous rev...???
> 
> It is a conflict - no special case is required.
> 
> If you have both modified the file at the same point (end,top,middle, 
> whatvever...) then CVS has no business ignoring that - it 
> *must* flag a 
> conflict.  In the end case how is it to know which one goes 
> first?  The 
> first edit or the last one?  What if putting both in at the same time 
> would break the syntax of the file?  These are things that 
> only a human 
> can decide.

Hmmm...I'm sure there are plenty of examples both ways, but: if you are both
Appending to a file, wouldn't that be ok to append both?  It seems like that
would be a good enhancement for certain types of files (flagged via
wrappers?)

Jeff