rebase-guide

rebase.md

@comment helps massively in doing a proper rebase

git config --global rerere.enabled true

@comment be on your dev branch

git pull origin main git rebase main

@comment now fix conflicts manually only once, since git rerere will record your chosen conflict resolutions

@comment publish your changes with --force parameter

git push -f