|
|
Let's say you have a feature branch, and you worked on it for quite a while. In the meantime the master went on, so your branch is no in sync with the HEAD. To test you changes with the latest version you want to pull the current status into your feature branch. So you want to do:
|
|
|
|
|
|
git merge master
|
|
|
|
|
|
But is this a good idea? Ralf proposes to use git rebase.
|
|
|
|
|
|
The web is not so clear about what is the best method in fact both methods recommended.
|
|
|
This is one blog entry explaining some issues around the options:
|
|
|
|
|
|
https://medium.com/@fredrikmorken/why-you-should-stop-using-git-rebase-5552bee4fed1
|
|
|
|
|
|
This wiki page is meant to develop into some recommendations when using git. |