[Qgis-developer] Contributing to QGIS using git

[strk]

On Tue, Dec 28, 2010 at 07:33:17AM -0900, Gary Sherman wrote:

> So to accept a contribution, I would branch my local copy, pull
> the changes, test, and merge back into master. Then use git-svn to
> dcommit the changes into the centralized QGIS repo.

Right, at that point the svn-dcommit would rewrite commits
to add svn metadata, so the original repo, containing the contributed
change, would likely get a conflict when trying to re-fetch from upstream
later (different commits touching the same files).

Have you tried this round-trip already ?

--strk;

  ()   Free GIS & Flash consultant/developer
  /\   http://strk.keybit.net/services.html