... | ... | @@ -36,34 +36,33 @@ In order to contribute to mHM, please follow these steps: |
|
|
|
|
|
# Working in your Fork
|
|
|
|
|
|
After creating the fork, you clone it to your local machine to work on it:
|
|
|
- After creating the fork, you clone it to your local machine to work on it:
|
|
|
|
|
|
git clone git@git.ufz.de:<you>/mhm.git
|
|
|
git clone git@git.ufz.de:<you>/mhm.git
|
|
|
|
|
|
Now create a feature branch and check it out (there your work is done!):
|
|
|
- Now create a feature branch and check it out (there your work is done!):
|
|
|
|
|
|
git checkout -b your_feature_branch
|
|
|
git checkout -b your_feature_branch
|
|
|
|
|
|
To stay up to date with the original ``develop`` branch, we add the mHM repository as an upstream branch:
|
|
|
- To stay up to date with the original ``develop`` branch, we add the mHM repository as an upstream branch:
|
|
|
|
|
|
git remote add upstream git@git.ufz.de:mhm/mhm.git
|
|
|
git remote add upstream git@git.ufz.de:mhm/mhm.git
|
|
|
|
|
|
If there was a new commit to the ``develop`` branch of mHM, you can fetch it:
|
|
|
- If there was a new commit to the ``develop`` branch of mHM, you can fetch it:
|
|
|
|
|
|
git fetch upstream
|
|
|
git fetch upstream
|
|
|
|
|
|
And then you can **rebase** or **merge** it into your feature branch (this can be tricky if things overlap...good luck!):
|
|
|
- Then you can **rebase** or **merge** the updated develop branch into your feature branch (this can be tricky if things overlap...good luck!):
|
|
|
|
|
|
git rebase −p upstream/develop
|
|
|
*or*
|
|
|
git merge upstream/develop
|
|
|
git rebase −p upstream/develop
|
|
|
*or*
|
|
|
git merge upstream/develop
|
|
|
|
|
|
It is recommended to use ``rebase`` at this point, to keep the history clear.
|
|
|
Have a look here, what that means: https://www.derekgourlay.com/blog/git-when-to-merge-vs-when-to-rebase/
|
|
|
It is recommended to use ``rebase`` at this point, to keep the history clear.
|
|
|
Have a look here, what that means: https://www.derekgourlay.com/blog/git-when-to-merge-vs-when-to-rebase/
|
|
|
|
|
|
- After working with `git add ...` and `git commit ...` as always, you have to push your changes to your repository on git.ufz.de:
|
|
|
|
|
|
After working with `git add ...` and `git commit ...` as always, you have to push your changes to your repository on git.ufz.de:
|
|
|
git push origin your_feature_branch
|
|
|
|
|
|
git push origin your_feature_branch
|
|
|
|
|
|
Then you can continue with the merge request as described in 4. |
|
|
\ No newline at end of file |
|
|
- Then you can continue with the merge request as described in 4. |
|
|
\ No newline at end of file |