git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Mark Bauermeister <warfan2007@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Cease and desist for companies and government agencies misusing git
Date: Thu, 30 Oct 2025 12:50:55 -0700	[thread overview]
Message-ID: <xmqq1pmk5fts.fsf@gitster.g> (raw)
In-Reply-To: <CADanQgA3h52hax-mdSTBV-tNDGvNRSxLU217aVygj7Cs7Lu8Bg@mail.gmail.com> (Mark Bauermeister's message of "Thu, 30 Oct 2025 16:27:10 +0100")

Mark Bauermeister <warfan2007@gmail.com> writes:

> 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.

There do exist people who make pointless back-merges into their
topic from the trunk, just like there are those who pointlessly
rebase their topic every time they notice that the trunk got
updated.  Both are bad, even though constant rebasing would hide the
fact they were rebased and what was integrated at the end was less
well tested than what was originally written, so in a sense it may
be worse.

These people need to learn that they can make trial merges every
once in a while so that their topic can be used with more recent tip
of trunk than where they forked from, and that they do not have to
keep these trial merges in the history.

      parent reply	other threads:[~2025-10-30 19:50 UTC|newest]

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

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

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

  git send-email \
    --in-reply-to=xmqq1pmk5fts.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=warfan2007@gmail.com \
    /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.
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 NNTP newsgroup(s).