git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Mark Bauermeister <warfan2007@gmail.com>
To: git@vger.kernel.org
Subject: Cease and desist for companies and government agencies misusing git
Date: Thu, 30 Oct 2025 16:27:10 +0100	[thread overview]
Message-ID: <CADanQgA3h52hax-mdSTBV-tNDGvNRSxLU217aVygj7Cs7Lu8Bg@mail.gmail.com> (raw)

Ok, this post (as well as the title. As much as I wish we could
prohibit such institutions from using our products) is partially
tongue in cheek, partially me venting and partially asking the
community for ideas on how to properly educate the vast masses of
"professional" developers still unaware of the soul crushing damage
their workflows (that barely work and definitely don't flow) cause to
others.

Earlier this year I got hired by a Swiss government agency. My late
mother was incredibly happy and proud of me at the time and knowing
that I just got bullied out of that job and finding myself once again
in the unemployment line is weighing heavily on me.

Long story short. The guy who was responsible for my firing spent a
good 4 months journaling my work and harassing management behind my
back only to blow up while on the phone with me, accusing me of such
heinous crimes as sending a PR from a fork (at a time I didn't have
write access to the main repository...) and *gasp* REBASING.

This dude is convinced (to a religious fervor) that Linus Torvalds was
possessed by a demon when he came up with `git rebase` and that in
order to defeat the devil, we need to plaster merge commits
EVERYWHERE.

His workflow is thusly:

- Create new feature branch based on the master or release branch (this is fine)
- Make changes
- Create PR (all PRs end in a merge commit, btw. This is fine but
makes his git behavior look even more unhinged)
- Check for changes on master/release and create a merge commit on his
branch (there's no logic behind this. He isn't creating a "logical
checkpoint", he just generally runs merge every time)
- If the PR doesn't get approved for a while, he'll keep creating more
merge commits
- Rinse and repeat this for every single feature branch under his
control. Merging merges into his merge (insert Pimp my Ride meme)
- Once the release PRs have been completed, merge (with a merge
commit, naturally...) the release branch into master.

Today I've counted 8 merge commits on changes that amount to about 20 LOC.

I don't wanna live in this world anymore. Beam me up, Scotty!

/end of rant

Is it time for an online campaign ala "Merge commits considered harmful"?

I have nothing against a merge commit being the result of a successful
PR but people spamming merge commits are ... something else.


             reply	other threads:[~2025-10-30 15:32 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-10-30 15:27 Mark Bauermeister [this message]
2025-10-30 15:39 ` Cease and desist for companies and government agencies misusing git Nico Williams
2025-10-30 19:50 ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CADanQgA3h52hax-mdSTBV-tNDGvNRSxLU217aVygj7Cs7Lu8Bg@mail.gmail.com \
    --to=warfan2007@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).