Martin Apel wrote:
>Hi, all
>
>I have a problem updating files in a branch containing keywords.
>Those files contain something like:
>
># Version : $Revision: 1.10.4.1 $
>
>before the update. Updating generates a conflict like the following:
>
><<<<<<< Rvr.make
># Version : $Revision: 1.10.4.1 $
>=======
># Version : $Revision: 1.12 $
>>>>>>>> 1.12
>
>This happens for the keywords Id, Date and Revision. When updating
>the whole branch this leads to endless conflicts, I have to resolve
by hand.
>Does anybody know a way around this?
>
Use '-kk' when doing the merge. This prevents the expansion of
keywords.
--
Stephen Rasku E-mail: [EMAIL PROTECTED]
Senior Software Engineer Phone: (604) 872-6676
TGI Technologies Web: http://www.tgivan.com/
