... | ... | @@ -52,9 +52,15 @@ If there was a new commit to the ``develop`` branch of mHM, you can fetch it: |
|
|
|
|
|
git fetch upstream
|
|
|
|
|
|
And then you can merge it into your feature branch (this can be tricky if things overlap...good luck!):
|
|
|
And then you can **rebase** or **merge** it into your feature branch (this can be tricky if things overlap...good luck!):
|
|
|
|
|
|
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/
|
|
|
|
|
|
|
|
|
After working with `git add ...` and `git commit ...` as always, you have to push your changes to your repository on git.ufz.de:
|
|
|
|
... | ... | |