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.
Best
Matthias
On 01/13/2014 09:49 AM, A Huarte wrote:
Hi, I can not update the repo, I write pull requests that someone
accept and merge after. I guess that's the right way to work, I manage
something wrong with my pull requests?
e.g.
https://github.com/qgis/QGIS/pull/1046
Alvaro
On 13 January 2014 18:51, Denis Rouzaud <[email protected]
<mailto:[email protected]>> wrote:
> Hi all,
>
> A lot of commits are missing between january 1st and 11th on the
repo. I
> suppose Alvaro forced an update since the whole is just after.
>
I'm not sure what's happened here... this occurred after I accepted
pull request 1046. After I did this the commits from the 1st-11th were
still there, just out of order and pushed back onto the second page.
Now they've disappeared entirely :/
Nyall
_______________________________________________
Qgis-developer mailing list
[email protected] <mailto:[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
