Re: What's cooking in git.git (Jul 2019, #04; Thu, 18)
- From
Matthew DeVore <matvore@comcast.net>
- Date
- Jul 22, 2019, 19:35 UTC
- Message-ID
- <20190722193535.GA11274@comcast.net>
- In-Reply-To
- <xmqqtvbjvull.fsf@gitster-ct.c.googlers.com>
On Thu, Jul 18, 2019 at 03:36:06PM -0700, Junio C Hamano wrote:
Show 15 quoted lines
> * 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