On Wed, Dec 17, 2014 at 5:27 PM, Nikos Alexandris <n...@nikosalexandris.net> wrote: > Probably! But, I did select for "tc" --> "theirs conflict" while updating.
This means that you keep your changes (somehow). > Anyway. Thanks (again). Should(n't) we go for """...""" in python scripts > instead of # whereever possible? No idea - so far not discussed AFAIK. But I see it here: https://trac.osgeo.org/grass/wiki/Submitting/Python > Some newer python scripts, I remember, have the AUTHOR and stuff info inside > a docstring. Then we should update all scripts accordingly if that's the way to go. The included scripts should ideally reflect best practice. Markus _______________________________________________ grass-dev mailing list grass-dev@lists.osgeo.org http://lists.osgeo.org/mailman/listinfo/grass-dev
