[gdal-dev] easiest way to merge commits from trunk to a branch?
etourigny.dev at gmail.com
Mon Jan 23 21:25:26 EST 2012
what is the preferred way to apply a fix to a branch, given a specific
commit to trunk?
I have tried from within the branch root directory the command 'svn
merge -c 23794 ../../../trunk/gdal/ .', which works but generates a
few non-related diffs like:
Property changes on: apps/gdaldem.cpp
Is there a way to get rid of these diffs permanently, or is there
another command I should use? I would prefer not to have to save and
then apply diffs each time.
More information about the gdal-dev