git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Matthew DeVore <matvore@comcast.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (Jul 2019, #04; Thu, 18)
Date: Mon, 22 Jul 2019 12:35:35 -0700	[thread overview]
Message-ID: <20190722193535.GA11274@comcast.net> (raw)
In-Reply-To: <xmqqtvbjvull.fsf@gitster-ct.c.googlers.com>

On Thu, Jul 18, 2019 at 03:36:06PM -0700, Junio C Hamano wrote:
> * md/list-objects-filter-combo (2019-06-28) 10 commits
> ...
> 
>  There is a bit of interaction with cc/multi-promisor topic, whose
>  conflict resolution I have no confidence in X-<.  Extra sets of
>  eyes are appreciated.
> ...
> 
> * cc/multi-promisor (2019-06-25) 15 commits
> ...
> 
>  There is a bit of interaction with md/list-objects-filter-combo
>  topic, whose conflict resolution I have no confidence in X-<.
>  Extra sets of eyes are appreciated.
> 

Do you still need input on the merge conflicts for these branches? I gave some
input earlier in this message:

https://public-inbox.org/git/20190714231558.GA24609@comcast.net/

- Matt

  reply	other threads:[~2019-07-22 19:36 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-18 22:36 What's cooking in git.git (Jul 2019, #04; Thu, 18) Junio C Hamano
2019-07-22 19:35 ` Matthew DeVore [this message]
2019-07-23 15:51   ` 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=20190722193535.GA11274@comcast.net \
    --to=matvore@comcast.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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).