Re: [PATCH v6 0/8] Multiple simultaneously locked ref updates
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Sep 10, 2013, 20:18 UTC
- Message-ID
- <xmqq7geoxwfl.fsf@gitster.dls.corp.google.com>
- In-Reply-To
- <522F4EDE.1010104@kitware.com>
Brad King <brad.king@kitware.com> writes:
Show 7 quoted lines
> On 09/10/2013 12:30 PM, Junio C Hamano wrote: >> Thanks. I am not sure if I should rewind and rebuild the series >> with these patches, though. This is a new feature and does not have >> to be merged to 'maint', so rebasing is perfectly fine, but it is >> not strictly necessary, either. > > I just thought I'd help out with the conflict resolution.
Yeah, such an independent confirmation of the conflict resolution is very much appreciated.