What is the difference between the code of other branches of git merge, git rebase, git pull ()

  1. git merge
  2. git rebase
  3. git pull, pull the code of Branch B on Branch An and merge

what is the difference between these three?

Mar.06,2021

merge:   
    a
   / \
  a1  b1
  |   |
  a2  b2
  |  /  -- merge
  | /
  a3 commit
rebase
    a
   / \
  a1  b1   
  |   |
  a2  b2  ----> rebase a -> a1 -> a2 -> b1 -> b2

will not generate a new commit
. To put it bluntly, rebase is to select the nearest two branches with the same base point, as shown in the example a, and then graft b1 directly onto the branch of your rebase

.

the more in-depth principle is the branch merging strategy.

Menu