[Qgis-developer] forced update on the repo?

[Denis Rouzaud]

it seems to affect que pull request now:
https://github.com/qgis/QGIS/pull/1067

On 13. 01. 14 10:35, Richard Duivenvoorde 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")
>> - 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.
>
> Regards,
>
> Richard Duivenvoorde
>
>
>
>
> _______________________________________________
> 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/20140113/f13ff0d1/attachment-0001.html>