I create a new branch locally with git switch --create, pull everything from main, sacrifice a small squirrel, and run the project to make sure everything still works.
Comment on History repeats itself
GigglyBobble@kbin.social 1 year ago
I usually merge because I like to see commit history as it happened and because rebasing multiple commits with conflicts is more time-consuming than fixing it in one merge commit.
I do rebase smaller changes though to reduce merge commit clutter and like interactive rebase to clean up my local commit mess before pushing.
colorado@programming.dev 1 year ago
ramjambamalam@lemmy.ca 1 year ago
You can just undo the last commit with git
reset --soft HEAD~1
pomodoro_longbreak@sh.itjust.works 1 year ago
If the changes are small enough I just do
rebase -Xtheirs main, and look to see if anything looks fucky (git diff main…).