Thread (4 messages) 4 messages, 3 authors, 2021-01-15

Re: What's cooking in git.git (Jan 2021, #02; Fri, 8)

From: Junio C Hamano <hidden>
Date: 2021-01-15 19:45:45

Possibly related (same subject, not in this thread)

Derrick Stolee [off-list ref] writes:
Thanks for dealing with this fallout. Sorry for the mixup.
quoted
Helped-by: Emily Shaffer [off-list ref]
Would it be appropriate to convert this to a Co-authored-by?
Or more like "Inspired-by-a-patch-by".  Also you three have about
the same amount of input and deserve credit.

Sorry, but it already is on 'next', which will be discarded in a few
months when the new cycle begins, so I am not sure if it is worth
reverting and reapplying with updated credit trailers.

FWIW, I ended up redoing the merge and did "checkout -m" to recreate
conflicts, and then looked for "config.*pwd" in the block of text
that came from the "part-4" topic and fixed them up manually.  I
then compared the result of this new merge with the earlier merge
that had the issue.  The resulting diff is what went into the patch
you are responding to.  It is good that we had Emily's input as a
comparison material to see that both of us independently touched the
same places to fix.

By the way, the merge into 'master' will directly reuse the conflict
resolution of e47c3632 (Merge branch 'ds/maintenance-part-4' into
jch, 2021-01-14) from the rerere database, without any separate
"merge fix" commit.

Thanks.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help