From: Junio C Hamano <gitster@pobox.com>
To: Johannes Sixt <j6t@kdbg.org>
Cc: Kai <k.vongrambusch@googlemail.com>, git@vger.kernel.org
Subject: Re: Git is not recognizing some merge conflicts and just accepting incoming master version
Date: Fri, 15 Mar 2024 15:29:23 -0700 [thread overview]
Message-ID: <xmqqzfuznn7g.fsf@gitster.g> (raw)
In-Reply-To: <ebd073ef-4ba4-44df-919a-2adefb40e3e7@kdbg.org> (Johannes Sixt's message of "Fri, 15 Mar 2024 23:19:16 +0100")
Johannes Sixt <j6t@kdbg.org> writes:
> That's the responsibility of the person doing the merge, who at best
> understands both branches being merged.[*] It is of utmost importance
> that a merge result produced by Git is not taken without thinking. It is
> never a no-brainer.
>
> [*] That is where good commit messages shine.
I am glad that some folks appreciate what I do every day ;-)
next prev parent reply other threads:[~2024-03-15 22:29 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-14 10:30 Git is not recognizing some merge conflicts and just accepting incoming master version Kai
2024-03-15 7:24 ` Johannes Sixt
2024-03-15 13:22 ` Kai
2024-03-15 21:47 ` brian m. carlson
2024-03-15 22:19 ` Johannes Sixt
2024-03-15 22:29 ` Junio C Hamano [this message]
2024-03-16 9:19 ` Kai
2024-03-23 19:17 ` Thomas Guyot
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=xmqqzfuznn7g.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
--cc=k.vongrambusch@googlemail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.