8,561
edits
FlightGear Git: Difference between revisions
m
→Merge requests: add screenshot
m (fixed broken link) |
m (→Merge requests: add screenshot) |
||
| Line 186: | Line 186: | ||
== Merge requests == | == Merge requests == | ||
=== Create === | === Create === | ||
Make a clone of fgdata, by clicking the [https://gitorious.org/fg/fgdata/clone clone repository] button on Gitorious. | [[File:Create merge request at Gitorious.png|thumb|270px|Creating a merge request at Gitorious.]] | ||
Make a clone of fgdata, by clicking the [https://gitorious.org/fg/fgdata/clone clone repository] button on Gitorious. Commit your stuff first to your local repository (git commit), then perform the following commands: | |||
* <code>git fetch</code> to get the latest commits from fgdata/ | |||
* <code>git rebase origin/master</code> place your own commit on top of the latest commits/ | |||
* <code>git push git@gitorious.org:~name/fg/namess-fgdata.git</code> push your commits to your fgdata clone. 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: | 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". | Next select the commits you'd like to include in your merge request and click "Create merge request". | ||
=== Push/merge === | === Push/merge === | ||
'''This step is for developers with fgdata commit access only!''' | |||
To push merge request to fgdata, the following workflow can be followed: | 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 checkout -b integration # the integration branch should not yet exist. You can use any name you'd like | ||