All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: "brian m. carlson" <sandals@crustytoothpaste.net>,  git@vger.kernel.org
Subject: Re: What's cooking in git.git (Jan 2025, #07; Fri, 24)
Date: Tue, 28 Jan 2025 09:59:14 -0800	[thread overview]
Message-ID: <xmqq8qquom4t.fsf@gitster.g> (raw)
In-Reply-To: <20250128164606.GA1688180@coredump.intra.peff.net> (Jeff King's message of "Tue, 28 Jan 2025 11:46:06 -0500")

Jeff King <peff@peff.net> writes:

> I noticed CI complaining about a missing include file:
>
>   2025-01-28T15:51:45.3979314Z asciidoc: WARNING: difftool.adoc: line 16: include file not found: /home/runner/work/git/git/Documentation/mergetools-diff.txt
>
> The problem is that the line was introduced by another concurrent
> branch, aj/difftool-config-doc-fix. So we can't fix it independently on
> either branch; the line does not exist yet in brian's adoc branch, and
> the file is still ".txt" in Adam's doc-fix branch.
>
> It has to be fixed in an evil merge of the two (or brian's rebased on
> Adam's, which has since graduated to master).

Thanks; I had this one on my radar and I thought there was a
merge-fix I made somewhere, but it is likely to have been lost
during shuffling the order of merges.  Will take a look again.

Thanks.

  reply	other threads:[~2025-01-28 17:59 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-01-24 20:19 What's cooking in git.git (Jan 2025, #07; Fri, 24) Junio C Hamano
2025-01-28 16:46 ` Jeff King
2025-01-28 17:59   ` Junio C Hamano [this message]
2025-01-28 18:26     ` Junio C Hamano
2025-01-29  6:03       ` Jeff King
2025-01-30  2:29       ` brian m. carlson
2025-01-30 17:26         ` Junio C Hamano
2025-01-29 13:40 ` Derrick Stolee
2025-01-29 15:03   ` 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

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

  git send-email \
    --in-reply-to=xmqq8qquom4t.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=peff@peff.net \
    --cc=sandals@crustytoothpaste.net \
    /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.