Evidently the following happened (in order)
You checked out Boa version 0.1.0
You modified a few lines of code
One of the developers modified some of the same lines of code (and cvs commit'ed
them)
You did an cvs update (cvs then flags those lines that have been modified by both
you and a developer if cvs cant figure out how to resolve it (most of the time))
Note: Once you resolve the conflicts, you can do a 'cvs update' to see the files
that still have some of your modifications, or 'cvs diff' to see what is left of
your changes.
between <<<<<<< and ======== is your version of the lines
between ======= and >>>>>>>>> is the developers version
>>>>> x.xx x.xx is the version of the file
Now:
pick one set of lines to delete and the lines with <,= and >.
Blaine
Ray Schumacher wrote:
> I have a menu issue with 0.1.0, so I tried the CVS version which now pukes on:
>
> <<<<<<< Boa.py
> if (wxMAJOR_VERSION, wxMINOR_VERSION) != (2, 3):
> =======
> if (wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_NUMBER) <
> __version__.wx_version:
> >>>>>>> 1.29
>
> and other similar lines. I'm not familiar with the <<<<<<<, =======, and
> >>>>>>> syntax...
|
