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