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