Re: [PATCH] Fix 'git remote show' regression on empty repository in 1.5.4
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:44:20
"Shawn O. Pearce" [off-list ref] writes:
It will cause a merge conflict against `master` as there is a change there to invoke transport_disconnect(transport) before displaying the refs. Since the disconnect patch is not in maint, but this is a current regression in 1.5.4.3, I'm sending you a conflicting patch. :)
That's perfectly fine. Merging is what maintainers do.