rebase步骤：
以从develop rebase 到feature/SKAND-153 为例
rebase步骤
1. update develop in local branch

  • checkout to develop
  • run this in terminal : git pull origin develop —rebase
    2. Rebase SKAND-153 with develop
  • checkout to your branch (feature/SKAND-153)
  • run this in terminal : git rebase develop
    3. Push force to origin
  • run this : git push -f origin feature/SKAND-153
    In step 2 : if the code is conflict, need to resolved first (choose the code that u want to keep) & then add to git after all conflict are resolved, run this : git rebase —continue

变基

git rebase —onto [target_branch] [base_branch] [my_branch]