[GRASS-dev] svn instructions needed

Moritz Lennert mlennert at club.worldonline.be
Fri Nov 25 23:20:54 PST 2016


Hi,

Just a quick question about mergin between branches.

In the course of the work on #3210 concerning r.texture [1], MarkusM and 
I have repeatedly modified the html man page in trunk. I would like to 
merge this back into the other branches. Do I need to individually merge 
all the different commits, or can I just copy over the finished version 
of the html file ? What is better in terms of svn history ?

Moritz



[1] https://trac.osgeo.org/grass/ticket/3210


More information about the grass-dev mailing list