We need merge branch with master when we finish new features or modificatin in our own braches.We can useand .
- git log will be different: merge will not remain the commits in branch.
git operation and effect is different:
- If we use git merge:
After we solve the confilct, then we useand .A commit will be produce to record the merge.
- If we use git rebase:
After we solve confilcts, then we then we useand . No extra commit is produced, which makes log more clean. However, if branch has many commits, we need to fix conflict for serveral times.Therefore, a better way is to use to use one commit.