this post was submitted on 03 Mar 2024
1089 points (97.8% liked)

Programmer Humor

19623 readers
1 users here now

Welcome to Programmer Humor!

This is a place where you can post jokes, memes, humor, etc. related to programming!

For sharing awful code theres also Programming Horror.

Rules

founded 1 year ago
MODERATORS
Feyter@programming.dev
anzo@programming.dev
BurningTurtle@programming.dev
pylapp@programming.dev
1089
My Git Knowledge (lemm.ee)
submitted 8 months ago by sag@lemm.ee to c/programmer_humor@programming.dev
170 comments fedilink hide all child comments
 
you are viewing a single comment's thread
view the rest of the comments
[–] zqwzzle@lemmy.ca 5 points 8 months ago

I like to rebase on my feature branches before the PR because it’s a gift to my future self that resolves all the conflicts (if any) before my work goes in. I just find trying to figure out how those conflicts got resolved when there are a bunch of merges in more difficult if there’s a problem later. It’s easier to understand for me. YMMV, this does not work for everyone. Etc etc.