Was digging through a project at work today where some guy in 2014 made 100+ commits in a single day and the only one that had a comment said “upgrading to v4.0”.

You get two options.

Normally it’s a squashed commit of everything in a feature, with a commit message like:

[JIRA-1234] - Descriptive but Concise Name of Feature

But every now and then it’s multiple commits like:

quick fix
Ugh, fix typo
fuck fuck why doesn’t it work
Oh, I’m stupid

Followed by

fixed formatting

final formatting fix

you gotta be kidding me, fuck you, detekt!

Bro, squash merge

beardedrhino
link
fedilink
32Y

Or if you’re using feature branches, rebase, squash, and force push before opening the MR

Sure, but before squashing you gotta commit

Create a post

All things programming and coding related. Subcommunity of Technology.


This community’s icon was made by Aaron Schneider, under the CC-BY-NC-SA 4.0 license.

  • 1 user online
  • 2 users / day
  • 3 users / week
  • 19 users / month
  • 126 users / 6 months
  • 1 subscriber
  • 328 Posts
  • 2.31K Comments
  • Modlog