Re: CVS commit error

[Malcolm Tredinnick <malcolm commsecure com au>]

On Fri, 2003-12-05 at 22:35, dooteo wrote:
> Hi,
> 
> update gpdf module (-z3 up -Pd), and ChangeLog's first lines are:
> 
> <<<<<<< ChangeLog
> 2003-12-05  Iñaki Larrañaga  <dooteo@euskalgnu.org>
> 
> 	* eu.po: Updated Basque translation.
> 
> =======
> 2003-12-04  Žygimantas Beručka  <uid0@tuxfamily.org>
> 
> 	* lt.po: Updated Lithuanian translation.
> 
> 2003-12-03  Sanlig Badral <badral@openmn.org>
> 
> 	* mn.po: Updated Mongolian translation. 
> 
> >>>>>>> 1.276
> 
> So, could I delete those lines?
> 
> <<<<<<< ChangeLog
> =======
> >>>>>>> 1.276
> 
> and after, make a commit of changeLog file?

Yes, that is correct in this case.

The problem here is caused by the fact that diff doesn't handle
insertions at the beginning or the end of a file very nicely (other
difference algorithms can handle those cases, but the standard diff one
does not, although it has other advantages).

(There are more complicated CVS conflict problems that can arise --
particularly in the middle of a file, but for ChangeLogs, it is almost
always like what you have seen here.)

Best wishes,
Malcolm