[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-multimedia
Subject:    Re: KREC
From:       Neil Stevens <neil () qualityassistant ! com>
Date:       2002-08-18 2:45:13
[Download RAW message or body]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On Saturday August 17, 2002 09:58, Arnold Krille wrote:
> - I am not so used to work with CVS together with other
> peoples. I use my CVS-Server for Backups but a "needs merge" is
> something new for me.

When you update, and a file that was changed is something you modified, cvs 
will try to merge it for you in the same way patch does. If that fails, it 
will stick both versions into your file, marked something like this

<<<<<<<<<<<<
( version from cvs )
- ------------
(version of yours )
>>>>>>>>>>>>

then it's your job to clean it up, taking all the fixes from both versions.

- -- 
Neil Stevens - neil@qualityassistant.com
"I always cheer up immensely if an attack is particularly wounding
because I think, well, if they attack one personally, it means they
have not a single political argument left." - Margaret Thatcher
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.6 (GNU/Linux)
Comment: For info see http://www.gnupg.org

iD8DBQE9Xwo6f7mnligQOmERApSYAKCIzFDB3ROKIGc/ywSejFiTvBlILwCfQA4r
3loP058bq2dPVNpDEUgrsYs=
=t7iT
-----END PGP SIGNATURE-----

_______________________________________________
kde-multimedia mailing list
kde-multimedia@mail.kde.org
http://mail.kde.org/mailman/listinfo/kde-multimedia
[prev in list] [next in list] [prev in thread] [next in thread]