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 points 1 year ago* (last edited 1 year ago) (1 children)

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.

If something doesn't work or I can't figure out how to resolve conflicts, I quietly switch back to my previous branch like nothing happened. That problem is for future me.

[–] ramjambamalam@lemmy.ca 4 points 1 year ago* (last edited 1 year ago)

You can just undo the last commit with git reset --soft HEAD~1

[–] pomodoro_longbreak@sh.itjust.works 1 points 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..).