git rebase

Expand later
git
git stash

steps:

git checkout main
git pull
git rebase {main} {feature_branch}
Powered by Forestry.md