On Sat, 2002-11-23 at 03:35, MacMunn, Robert wrote:
>
>
> I am new to CVS. I am testing out merging.
>
> When I merged 2 files I got extra lines teling me where the merged lines
> where.
> Is there any way around this ?
This means that the same lines were changed in the two files, and CVS
doesn't know which lines the humans want put where. It's called a
'conflict', and it requires human intervention.
> <<<<<<< nightly_kituibuild_sol_flash_LOG_Sep27_12.36.10_151
> #eeee
> #ffff
> #gggg
> =======
> #aaaaa
> #bbbb
> #cccc
> >>>>>>> 1.2.2.4
eeee, ffff and gggg were changed in the first file, and aaaaa, bbbb and
cccc were changed in the second file. Both were line numbers foo, foo+1
and foo+2, so CVS couldn't just plug them in as it normally does.
The way to prevent this from happening is to ensure that noone edits the
same lines of the same revision. :) Yes, that's overly simplistic.
If you need more help or a better explanation, ask.
Jenn V.
--
"Do you ever wonder if there's a whole section of geek culture
you miss out on by being a geek?" - Dancer.
[EMAIL PROTECTED] http://anthill.echidna.id.au/~jenn/
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
