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 <[email protected]> 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 post in > order to show the logic of rebasing onto a commit. If people have better > cleaner ways to work then I'm happy to update the post. > > I would also like to see a CONTRIBUTING file made, happy to make a start > on that if anyone wants me to. Even if it's just my git stuff then we can > add stuff later. > > - Nathan > > > On Thu, Feb 21, 2013 at 6:23 AM, Larry Shaffer <[email protected]>wrote: > >> Hi Amit, >> >> On Wed, Feb 20, 2013 at 12:48 PM, Amit Kulkarni <[email protected]>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 for QGIS [0]. IMHO, it >> should be included as a 'best practice' workflow in CODING, or maybe a new >> document named CONTRIBUTING, in the QGIS source distribution, as a >> reference for people looking to contribute. >> >> Regards, >> >> Larry >> >> [0] http://nathanw.net/2013/02/05/my-qgis-git-workflow/ >> >> >> >>> Thanks >>> >>> _______________________________________________ >>> Qgis-developer mailing list >>> [email protected] >>> http://lists.osgeo.org/mailman/listinfo/qgis-developer >>> >>> >> >> _______________________________________________ >> Qgis-developer mailing list >> [email protected] >> http://lists.osgeo.org/mailman/listinfo/qgis-developer >> >> >
_______________________________________________ Qgis-developer mailing list [email protected] http://lists.osgeo.org/mailman/listinfo/qgis-developer
