In this walkthrough you will find two different merge strategies:
git merge and
Both strategies have their own pros and cons.
The main benefit of
git merge is that you keep the original history of the
master branch in tact. However, conflicts are handled during the merge into the
The main benefit of the
git rebase is that conflicts are handled in the feature branch and conflicts will not need to be managed when merging with the
master branch. However, performing a
rebase alters the history of the feature branch.
get mergerequires you to merge a branch directly into master.
git rebaseallows you to rebase your development branch on top of master.
The walkthrough articles in this section will be using the py-demo-web-logs-continued GitHub repository.