Thread (37 messages) flat view 37 messages, 6 authors, 2021-10-01

Re: [PATCH 2/7] merge-ort: add ability to record conflict messages in a file

From: Ævar Arnfjörð Bjarmason <hidden>
Date: 2021-09-30 08:11:14

On Thu, Sep 30 2021, Jeff King wrote:
[...]
That said, I think it could also make sense to annotate the conflict
files by giving them an unusual set of mode bits. That would be easier
to recognize (and while real trees _could_ have silly modes, we do
complain about them in fsck, so it shouldn't happen in practice).
We don't complain about them in fsck. I've been meaning to get to fixing
it, but my fixes were contingent on the rather big "tree walk mode bits"
series: https://lore.kernel.org/git/87wnu0r8tq.fsf@evledraar.gmail.com/ (local)
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help