222 B
222 B
git rebase
Apply local commits on top of another branch's history
- Rebase your local branch with the latest changes in master
git rebase -i master
(Then follow the directions in the terminal for merge conflicts)