473
you are viewing a single comment's thread
view the rest of the comments
[-] GigglyBobble@kbin.social 3 points 1 year ago

If your cherry-pick doesn't run into conflicts why would your merge? You don't need to merge to master until you're done but you should merge from master to your feature branch regularly to keep it updated.

[-] Blamemeta@lemm.ee -1 points 1 year ago

Git is weird sometimes.

this post was submitted on 14 Aug 2023
473 points (97.4% 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