Hi
On Mon, Jan 13, 2014 at 2:47 PM, Matthias Kuhn <[email protected]> wrote: > Thank you Tim, > > Small change: > > "Don't merge anything in other than master" > I would remove "other than master". > Instead of merging in master, one should rather rebase on top of master > like explained in the lines below. This keeps the history cleaner. > > Done with a273b69 thanks. T > Regards, > Matthias > > > > On Mon 13 Jan 2014 01:39:03 PM CET, Tim Sutton wrote: > >> Hi >> >> >> On Mon, Jan 13, 2014 at 1:59 PM, Tim Sutton <[email protected] >> <mailto:[email protected]>> wrote: >> >> Hi >> >> >> On Mon, Jan 13, 2014 at 11:35 AM, Richard Duivenvoorde >> <[email protected] <mailto:[email protected]>> wrote: >> >> On 13-01-14 10:18, Matthias Kuhn wrote: >> > Some general advice (althogh I'm not sure how exactly that >> happened) is to >> > >> > For creating a pull request >> > =============== >> > - always start a feature branch from current master >> > - if you are coding a feature branch, don't "merge" anything in >> > - before you create a pull request do "git fetch origin" and >> "git rebase >> > origin/master" (given origin is the remote for upstream and >> not your own >> > remote, check your .git/config or do "git remote -v | grep >> > github.com/qgis <http://github.com/qgis>") >> >> > - you may do a "git rebase" like in the last line repeatedly >> without >> > doing any damage (as long as the only purpose of your branch >> is to get >> > merged into master) >> > - Attention: After a rebase you need to "git push -f". CORE >> DEVS: IF YOU >> > DO THIS ON THE UPSTREAM REPOSITORY YOU WILL BRING CAKE FOR >> EVERYBODY TO >> > THE NEXT HF! >> > >> > For merging a pull request >> > =============== >> > Option A) >> > - click the merge button (Creates a non-fast-forward merge) >> > >> > Option B) >> > - Checkout the pull request (See >> > https://gist.github.com/piscisaureus/3342247) >> > - Test (Also required for option A, obviously) >> > - checkout master, "git merge pr/1234" >> > - Optional: "git pull --rebase": Creates a fast-forward, >> no "merge >> > commit" is made. Cleaner history, but it is harder to revert >> the merge. >> > - "git push" >> > >> > I hope that I got things right and that somebody finds this >> useful. >> >> Hi Matthias, >> >> I think it is VERY usefull. But I also think we should create a >> 'git'-page in documentation which contains this info. >> >> I think it would also be helpfull to show the (more general) git >> commands for creating a local branch etc. >> >> I'll try to create a page for that with the information above, >> and add >> some stuff that I think is usefull. >> Plz have a look into it when finished. >> >> >> >> Richard this kind of stuff should go in the CODING doc. I have >> already added some infor on Pull Requests there following our >> previous to last PSC meeting, and just updated it with Matthias' >> notes too. I'm just waiting for my internet to allow me to >> actually push it..... >> >> >> Commit is here: >> >> https://github.com/qgis/QGIS/commit/e745b2ffa5a6f1a249dedba18eded2 >> 32857097c7 >> >> Regards >> >> Tim >> >> Regards >> >> Tim >> >> >> Regards, >> >> Richard Duivenvoorde >> >> >> >> >> _______________________________________________ >> Qgis-developer mailing list >> [email protected] >> <mailto:[email protected]> >> >> http://lists.osgeo.org/mailman/listinfo/qgis-developer >> >> >> >> >> -- >> Tim Sutton - QGIS Project Steering Committee Member >> ============================================== >> Please do not email me off-list with technical >> support questions. Using the lists will gain >> more exposure for your issues and the knowledge >> surrounding your issue will be shared with all. >> >> Irc: timlinux on #qgis at freenode.net <http://freenode.net> >> >> ============================================== >> >> >> >> >> -- >> Tim Sutton - QGIS Project Steering Committee Member >> ============================================== >> Please do not email me off-list with technical >> support questions. Using the lists will gain >> more exposure for your issues and the knowledge >> surrounding your issue will be shared with all. >> >> Irc: timlinux on #qgis at freenode.net <http://freenode.net> >> ============================================== >> >> >> >> _______________________________________________ >> Qgis-developer mailing list >> [email protected] >> http://lists.osgeo.org/mailman/listinfo/qgis-developer >> > > > -- Tim Sutton - QGIS Project Steering Committee Member ============================================== Please do not email me off-list with technical support questions. Using the lists will gain more exposure for your issues and the knowledge surrounding your issue will be shared with all. Irc: timlinux on #qgis at freenode.net ==============================================
_______________________________________________ Qgis-developer mailing list [email protected] http://lists.osgeo.org/mailman/listinfo/qgis-developer
