this post was submitted on 26 Aug 2023
1220 points (98.4% liked)

Programmer Humor

32380 readers
1402 users here now

Post funny things about programming here! (Or just rant about your favourite programming language.)

Rules:

founded 5 years ago
MODERATORS
 
you are viewing a single comment's thread
view the rest of the comments
[โ€“] [email protected] 2 points 1 year ago (1 children)

merge commits that catch my feature branches up to main

You'd be squashing those when you merge back down into main anyway, no?

[โ€“] [email protected] 2 points 1 year ago

You'd hope so - and if one does, I have no concerns about whatever one chooses to do in the privacy of their own branch - but some people insist on directly merging to main (preserving two parallel histories), rather than squashing their change into a single commit. Savages ;)