Brad King [off-list ref] writes:
On 09/10/2013 12:30 PM, Junio C Hamano wrote:
quoted
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.