soniya.rayabagi
Wed Jan 31 2024
Git rebase
is a command to reapply commits from one branch onto another, effectively rewriting the commit history.
- Use
git rebase main
to start. - Resolve conflicts manually in files.
- Add resolved files
git add <file>
. - Continue rebase
git rebase --continue.
- Finally, force-push changes
git push <remote> <branch-name> —-force
.