From: Lucas Seiki Oshiro <lucasseikioshiro@gmail.com>
To: "Junio C Hamano" <gitster@pobox.com>,
"Jean-Noël Avila" <jn.avila@free.fr>
Cc: git@vger.kernel.org, Elijah Newren <newren@gmail.com>
Subject: Re: [GSoC][PATCH v2] merge-strategies.adoc: detail submodule merge
Date: Sat, 22 Feb 2025 16:36:26 -0300 [thread overview]
Message-ID: <0256f214-795d-42a4-8319-4ba79777face@gmail.com> (raw)
In-Reply-To: <xmqqy0xz9nno.fsf@gitster.g>
> And of course a 6-line paragraph is not large enough to put in a
> separate file to be included.
I'm a newbie here, so I can't have a strong opinion on what's
the best solution for managing those files. But, given that:
1. `ort` will sometime replace `recursive`
2. the last change in the content of this document was in
f5a3c5e637, three years ago, basically copying the content
from `recursive` to `ort`
it looks like to me that creating another file only for this
paragraph would harder to maintain than that duplication.
I mean, if eventually `recursive` is replaced by `ort`, one
will need to remember to move this paragraph to
`merge-strategies`, as it will be used only in the `ort`
documentation. On the other hand, given that this document
haven't changed since the introduction of `ort`, this
duplication doesn't seem to me that will be hard to be
managed.
Anyway, thanks for the feedback!
next prev parent reply other threads:[~2025-02-22 19:36 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-20 15:12 [GSoC][PATCH v2] merge-strategies.adoc: detail submodule merge Lucas Seiki Oshiro
2025-02-20 18:46 ` D. Ben Knoble
2025-02-20 19:12 ` Junio C Hamano
2025-02-21 10:17 ` Jean-Noël Avila
2025-02-21 18:07 ` Junio C Hamano
2025-02-22 19:36 ` Lucas Seiki Oshiro [this message]
2025-02-22 22:17 ` Junio C Hamano
2025-02-24 17:31 ` D. Ben Knoble
2025-02-21 21:56 ` 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:
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=0256f214-795d-42a4-8319-4ba79777face@gmail.com \
--to=lucasseikioshiro@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jn.avila@free.fr \
--cc=newren@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).