> > > But one has been described here several times. There are *always* > backups of the original files when conflicts occur. Just copy the backup > to the original and carry on as you were. I do not see the problem here > and it certainly doesn't involve deep knowledge about the cvs tools etc. > It's just a simple mv(1) :-) You have to know this backup exists, especially since it's a hidden file... I remember looking for such a thing, but didn't think to look for a hidden file ;) Christophe
Ceci est une partie de message=?ISO-8859-1?Q?num=E9riquement?= =?ISO-8859-1?Q?_sign=E9e?=