8,564
edits
FlightGear Git: Difference between revisions
Jump to navigation
Jump to search
Merge requests
(→fgdata.bundle: updated instructions for new bundle version) |
(Merge requests) |
||
| Line 176: | Line 176: | ||
For future updates just do a '''<code>git pull</code>'''. | For future updates just do a '''<code>git pull</code>'''. | ||
== Merge requests == | |||
=== Create === | |||
Make a clone of fgdata, by clicking the [https://gitorious.org/fg/fgdata/clone clone repository] button on Gitorious. | |||
# normal commit workflow # | |||
# git commit # | |||
git fetch # to get the latest commits from fgdata | |||
git rebase origin/master # place your own commit on top of the latest commits | |||
git push git@gitorious.org:~name/fg/namess-fgdata.git # replace the url with your fgdata-clone's SSH url | |||
Go to your fgdata-clone on Gitorious and click the "Request merge" button on the right. Write a short summary in which you explain what your commit(s) do. Then choose the following settings: | |||
* Target directory: fgdata | |||
* Target branch: master | |||
* Source branch: master | |||
Next select the commits you'd like to include in your merge request and click "Create merge request". | |||
=== Push/merge === | |||
To push merge request to fgdata, the following workflow can be followed: | |||
git checkout -b integration # the integration branch should not yet exist. You can use any name you'd like | |||
git pull git://gitorious.org/fg/fgdata.git refs/merge-requests/1 # make sure you change 1 to the id of the merge request | |||
git rebase master # place the new commits on top of existing commits (without ugly "Merge branch into ...") | |||
git checkout master | |||
git cherry-pick b049e1d # repeat this for each commit you'd like to push | |||
git push | |||
== External links == | == External links == | ||