[Qgis-developer] Contributing to qgis using git

[Nathan Woodrow]

Thanks Gary,

This maybe be a noobish question but I thought I would ask first before
doing anything.

Say I'm working on a new feature/bug/whatever and I have made a branch in my
git repo to work on it and have pushed the branch to git hub.  Wouldn't it
be better to make a pull request from the branch rather then merging into my
master line and making the pull request from there?

My reasons for this are: if I work on a new feature and merge it into my
master line then make a pull request to qgis/qgis and my new feature, for
whatever reason, doesn't make it into the main qgis repo, my master branch
will always have my changes regardless of if the qgis team decide that are
not needed. Every time I do a pull request for something else in the future
those changes will be still there and wanting to get pulled across.

My thoughts were to keep the master branch clean, with only the changes from
the main repo qgis/qgis using git fetch upstream; git merge upstream/master
[keeping the branches up to date using the same method] and then branch and
ask for pull request from the branchs into the qgis/qgis project.  That way
if the feature is broken/not needed I can just kill the branch and start
over from master.

Hopefully that made sense.  What are your thoughts?

- Nathan

On Wed, Dec 29, 2010 at 3:24 AM, Gary Sherman <gsherman at geoapt.com> wrote:

> On 12/28/10 3:36 AM, Nathan Woodrow wrote:
>
>> Hi All,
>>
>> I was just reading this:
>> http://spatialgalaxy.net/2010/12/27/contributing-to-qgis-using-git/
>>
>> Is this a better method for submitting patches vs attaching a patch in
>> trac?
>>
>> - NathanW
>>
>
> It depends on what you want to do. For a one-off patch there is no reason
> to use git and clone the repository. If you want to continue to contribute,
> keep your working copy up to date, and be able to push changes, then using
> GitHub makes sense.
>
> If you are doing QGIS work and wish you had SVN access, then the git route
> is for you...
>
> -gary
>
>>
>>
>>
>> _______________________________________________
>> Qgis-developer mailing list
>> Qgis-developer at lists.osgeo.org
>> http://lists.osgeo.org/mailman/listinfo/qgis-developer
>>
>
>
> --
> -_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-
> Gary Sherman
> Chair, QGIS Project Steering Committee
> -Desktop GIS Book:
> *http://desktopgisbook.com
> -Geospatial Consulting & Hosting
> *http://geoapt.com
> "We work virtually everywhere"
> -_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-
> _______________________________________________
> Qgis-developer mailing list
> Qgis-developer at lists.osgeo.org
> http://lists.osgeo.org/mailman/listinfo/qgis-developer
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.osgeo.org/pipermail/qgis-developer/attachments/20110104/37e41340/attachment.html