Git Mailing List Archive mirror
 help / color / mirror / Atom feed
From: Felipe Contreras <>
To: Junio C Hamano <>,
	Adam Johnson via GitGitGadget <>
Cc:, Elijah Newren <>,
	Adam Johnson <>
Subject: Re: [PATCH] doc: merge: improve conflict presentation docs
Date: Sun, 07 May 2023 16:15:33 -0600	[thread overview]
Message-ID: <64582305ee966_4e612948f@chronos.notmuch> (raw)
In-Reply-To: <xmqqzg6ibe42.fsf@gitster.g>

Junio C Hamano wrote:
> "Adam Johnson via GitGitGadget" <> writes:
> > From: Adam Johnson <>
> >
> > Improvements:
> >
> > 1. Remove the sexist example ("Barbie... wants to go shopping")
> "Barbie goes shopping" is a pretty common meme.

And it's not sexist in the least.

Tony Montana likes big guns, and it's not sexist to say that outloud.

Tina can like big guns as well, and Peter can like to go shopping.

The fact that a preference happens to match a stereotype doesn't mean that
saying so constitutes bigotry.

I'm Mexican and I like tacos. There's nothing wrong with somebody saying
"Felipe likes tacos", especially because it's true.

So what if Barbie likes to go shopping? So what if Amanda likes the color pink?

Am I not allowed to like tacos because I'm Mexican?

Felipe Contreras

  reply	other threads:[~2023-05-07 22:15 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-05 13:58 [PATCH] doc: merge: improve conflict presentation docs Adam Johnson via GitGitGadget
2023-05-05 22:35 ` Junio C Hamano
2023-05-07 22:15   ` Felipe Contreras [this message]
2023-05-06 23:40 ` Elijah Newren
2023-05-07 22:25   ` Felipe Contreras
2023-05-08 15:25   ` Elijah Newren

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:

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

  git send-email \
    --in-reply-to=64582305ee966_4e612948f@chronos.notmuch \ \ \ \ \ \ \

* 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 read-only IMAP folder(s) and NNTP newsgroup(s).