Re: [Qgis-developer] contributing diffs

2013-02-26 Thread Paolo Cavallini
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Il 21/02/2013 11:17, Paolo Corti ha scritto: Sorry, here it is: https://github.com/GeoNode/geonode/blob/dev/docs/developers/document-issue-solve-and-merge.txt Hi all. I think this is a very good workflow, that cuold make QGIS releases smoother and

Re: [Qgis-developer] contributing diffs

2013-02-24 Thread vinayan
Hi Larry, You are correct.. I just had to do a force push :( -- View this message in context: http://osgeo-org.1560.n6.nabble.com/contributing-diffs-tp5035623p5036509.html Sent from the Quantum GIS - Developer mailing list archive at Nabble.com. ___

Re: [Qgis-developer] contributing diffs

2013-02-22 Thread Larry Shaffer
Hi Vinayan, On Thu, Feb 21, 2013 at 11:13 PM, vinayan vinayan...@gmail.com wrote: I also believe a nice workflow should be in the qgis website somewhere. We have a brief one here at http://hub.qgis.org/wiki/17/GIT_Workflow Probably someone could update the above page and link it to the

Re: [Qgis-developer] contributing diffs

2013-02-21 Thread Paolo Corti
Hi Amit, On Wed, Feb 20, 2013 at 12:48 PM, Amit Kulkarni amitk...@gmail.com wrote: Hello, Is there a good document on the git pull workflow that you follow? Is it instead ok to submit git diff against http://github.com/qgis/Quantum-GIS/? Recently, Nathan wrote up a very nice git

Re: [Qgis-developer] contributing diffs

2013-02-21 Thread Paolo Corti
Sorry, here it is: https://github.com/GeoNode/geonode/blob/dev/docs/developers/document-issue-solve-and-merge.txt cheers p On Thu, Feb 21, 2013 at 10:47 AM, Marco Bernasocchi ma...@bernawebdesign.ch wrote: paolo, you forgot the link :) Marco Bernasocchi (mobile) http://opengis.ch On 21 Feb

Re: [Qgis-developer] contributing diffs

2013-02-21 Thread Amit Kulkarni
Nathan, Will you please post how to update your git fork after you issue a pull request? I am getting Merge warnings in my fork and applying the same branch fix again and again in the commit log. Thanks in advance On Thu, Feb 21, 2013 at 6:03 AM, Nathan Woodrow madman...@gmail.com wrote:

Re: [Qgis-developer] contributing diffs

2013-02-21 Thread Larry Shaffer
Hi, On Thu, Feb 21, 2013 at 5:03 AM, Nathan Woodrow madman...@gmail.com wrote: Thanks Larry. Just to note that there are a few shortcuts that one can take that I didn't have in my work follow, things like git rebase -i master rather then giving it the commit. I didn't do this in the blog

Re: [Qgis-developer] contributing diffs

2013-02-21 Thread vinayan
I also believe a nice workflow should be in the qgis website somewhere. We have a brief one here at http://hub.qgis.org/wiki/17/GIT_Workflow Probably someone could update the above page and link it to the developer help pages.. Below mentioned link mentions my workflow..what i observed with

[Qgis-developer] contributing diffs

2013-02-20 Thread Amit Kulkarni
Hello, Is there a good document on the git pull workflow that you follow? Is it instead ok to submit git diff against http://github.com/qgis/Quantum-GIS/ ? Thanks ___ Qgis-developer mailing list Qgis-developer@lists.osgeo.org

Re: [Qgis-developer] contributing diffs

2013-02-20 Thread Larry Shaffer
Hi Amit, On Wed, Feb 20, 2013 at 12:48 PM, Amit Kulkarni amitk...@gmail.com wrote: Hello, Is there a good document on the git pull workflow that you follow? Is it instead ok to submit git diff against http://github.com/qgis/Quantum-GIS/? Recently, Nathan wrote up a very nice git workflow

Re: [Qgis-developer] contributing diffs

2013-02-20 Thread Amit Kulkarni
On Wed, Feb 20, 2013 at 2:23 PM, Larry Shaffer lar...@dakotacarto.comwrote: Hi Amit, On Wed, Feb 20, 2013 at 12:48 PM, Amit Kulkarni amitk...@gmail.comwrote: Hello, Is there a good document on the git pull workflow that you follow? Is it instead ok to submit git diff against