[Qgis-community-team] svn merge?

[Jürgen E. Fischer]

Hi Tara,

On Sat, 07. Jun 2008 at 11:05:02 -0700, Tara Athan wrote:
> I have made some changes in qgis_style.tex that I need to commit.
> However, my copy does not include some changes that were made on 6/5 by 
> sholl.
> How do I commit my changes without messing up the others?

You just do an svn update.

If you are lucky you didn't change the particular parts that Stephan
changed and the update will just work.  Your changed working copy will
be updated with Stephans changes and contain both changes.

Otherwise svn update will find conflicting changes and show the files
with conflicts prefixed with "C" instead of "U".  Those file will
show the conflicting changes like this:

<<<<<<<
your changed part
=======
Stephans part
>>>>>>>

You're then supposed to replace the conflicting parts with an updated
passage.  After that you run

svn resolved name_of_conflicting_file.tex

and then you can svn commit as usual.


> I assume this has something to do with merge, but I am not quite sure 
> how to accomplish it.

merge is used when you work in multiple branches and want to port
changes from one branch to another.


Jürgen

-- 
Jürgen E. Fischer         norBIT GmbH               Tel. +49-4931-918175-0
Dipl.-Inf. (FH)           Rheinstraße 13            Fax. +49-4931-918175-50
Software Engineer         D-26506 Norden               http://www.norbit.de

-- 
norBIT Gesellschaft fuer Unternehmensberatung und Informationssysteme mbH
Rheinstrasse 13, 26506 Norden
GF: Jelto Buurman, HR: Amtsgericht Emden, HRB 5502