[Qgis-community-team] Re: svn merge?

[Otto Dassau]

Am Samstag, den 07.06.2008, 11:05 -0700 schrieb Tara Athan:
> 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?
> I assume this has something to do with merge, but I am not quite sure 
> how to accomplish it.

this is one simple possiblity:

mv qgis_style.tex tara_qgis_style.tex
svn update
add your changes from tara_qgis_style.tex again to qgis_style.tex
svn commit

usually it is important to svn update first, then make changes to files
and commit them again. 

 Otto

> Thanks, Tara