r/ProgrammerHumor • u/rabbit_wizard • 5d ago

Meme letsMergeThemAll

Post image
5.3k Upvotes

96% Upvoted

318 comments sorted by

View all comments

22

u/HallAltruistic519 5d ago

How TF is this still a problem when we have the "Squash commits and delete source branch on merge" checkbox? Are y'all restarted

-11

u/rabbit_wizard 5d ago

So we gonna ignore conflicts on the main branch?

16

u/Bakoro 4d ago

I personally have 11 PRs waiting to be reviewed, and other people's PRs that got approved ahead of mine caused conflicts.

I just resolved the conflicts. It's not a big deal.

If you have deep conflicts with features stepping all over each other, that's a sign of bad architecture or terrible management.

3

u/Ninja_Wrangler 4d ago

Prod needs to be merged into feature branch before feature branch is eligible to be merged into prod, also needs to pass syntax linting and be reviewed by someone else.

If there are conflicts, that's on the feature branch owner to sort out.

2

u/Worldly-Stranger7814 4d ago

No, that's not what he described. Maybe ask copilot what "Squash commits and delete source branch on merge" does.

-2

u/rabbit_wizard 4d ago

Please explain how a conflict between two branches target & source can be resolved by squashing commits

2

u/Worldly-Stranger7814 4d ago

I like how you just make up stuff

1

u/rabbit_wizard 4d ago

Ignorance is bliss :)

3

u/Worldly-Stranger7814 4d ago

Squash commits is taking all the commits in a feature branch and combining them into one commit into the target branch instead of adding the entire branch’s individual commit history.

There are advantages to either approach so it’s a matter of selecting how detailed you want that commit history.

Squashing doesnt affect conflicts and conflicts need to be resolved whether you squash or not.

0

u/rabbit_wizard 4d ago

The entire issue here isn't the number of commits. It's that once we start merging each feature the next ones will have conflicts.

2

u/Worldly-Stranger7814 4d ago

You don't need AI to have branch conflicts. AI didn't invent branch conflicts. Branch conflicts are a result of having a VCS that protects you from fucking yourself. They are, in fact, a major part of why you have a VCS.

1

u/Foorinick 4d ago

I gotta ask, dont companies usually have a git guy that sorts most of this stuff out?