What’s the difference between ‘git merge’ and ‘git rebase’?

by

Suppose originally there were 3 commits, A,B,C:

A-B-C

Then developer Dan created commit D, and developer Ed created commit E:

A-B-C-D-E

Obviously, this conflict should be resolved somehow. For this, there are 2 ways:

MERGE:

A-B-C-D-E-M

Both commits D and E are still here, but we create merge commit M that inherits changes from both D and E. However, this creates diamond shape, which many people find very confusing.

REBASE:

A-B-C-D-E-R

We create commit R, which actual file content is identical to that of merge commit M above. But, we get rid of commit E, like it never existed (denoted by dots – vanishing line). Because of this obliteration, E should be local to developer Ed and should have never been pushed to any other repository. Advantage of rebase is that diamond shape is avoided, and history stays nice straight line – most developers love that!

More Related Contents:

  1. What is the difference between merge –squash and rebase?
  2. Rebasing a Git merge commit
  3. Undoing a git rebase
  4. When do you use Git rebase instead of Git merge?
  5. Git workflow and rebase vs merge questions
  6. When would you use the different git merge strategies?
  7. How to squash all git commits into one?
  8. How to import existing Git repository into another?
  9. Insert a commit before the root commit in Git?
  10. Combine the first two commits of a Git repository?
  11. How can I prevent foxtrot merges in my ‘master’ branch?
  12. Remove folder and its contents from git/GitHub’s history
  13. Rebasing a branch including all its children
  14. git cherry-pick says “…38c74d is a merge but no -m option was given”
  15. How to rebase many branches (with the same base commit) at once?
  16. Squash the first two commits in Git? [duplicate]
  17. Can I make fast forwarding be off by default in git?
  18. git remove merge commit from history
  19. git rebase and git push: non-fast forward, why use?
  20. How do I use `git rebase -i` after `git merge` without messing things up?
  21. How to identify conflicting commits by hash during git rebase?
  22. Change old commit message using `git rebase`
  23. How to merge two branches without a common ancestor?
  24. How to rebase one Git repository onto another one?
  25. Git interactive rebase without opening the editor
  26. Tell git not to merge binary files but to choose
  27. Git: How to rebase to a specific commit?
  28. git: merge two branches: what direction?
  29. Git rebase branch with all parent branches (or dependent sub-branches)
  30. The following untracked working tree files would be overwritten by merge, but I don’t care

Leave a Comment