git pull --rebase origin <branch-name> In case, there are no conflicts, Git will voluntarily commit the changes on top of the updated branch. However, in case of conflicts, the rebase process will ...