Re: [PATCH v5 00/31] Follow perlcritic's recommandations
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jun 12, 2013, 22:53 UTC
- Message-ID
- <7vobbbym7s.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <vpqr4g7owyi.fsf@anie.imag.fr>
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:
Show 9 quoted lines
> Which commit is this based on? > > "git am" fails, whether I try from Junio's master, next or pu. My best > try was from da608b124c76f8f7dba8a9d8f0bc8174b9744176. It seems you're > based on a local commit which doesn't exist on Junio's end. > > Most commit in-flight are in next, so I guess rebasing the series on > next would make it easier for Junio (we normally send patches against > master as much as possible, see SubmittingPatches for more details).
This is why a wholesale updates like "use sq instead of dq when we can", "always return; from a sub", etc. needs inter-developer coordination.
I agree with you that it would probably be the easiest to build this on top of the merge bewteen master, bp/mediawiki-credential, and your mm/mediawiki-https-fail-message topics.
Thanks.