473

submitted 10 months ago by alphacyberranger@lemmy.world to c/programmer_humor@programming.dev

35 comments fedilink hide all child comments

you are viewing a single comment's thread
view the rest of the comments

[-] GigglyBobble@kbin.social 18 points 10 months 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 points 10 months ago* (last edited 10 months ago)

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.