[teampractices] Code review social norms

[Gergo Tisza]

On Wed, Mar 16, 2016 at 4:25 AM, Mukunda Modell <mmodell at wikimedia.org>
wrote:

> Tweaking the code during merge is actually something differential /
> arcanist already supports. It's amending someone else's revision (outside
> of the merge process) that is currently prevented in arcanist.
>

Nontrivial changes in a merge commit is a bad practice, as the changes are
invisible to git diff / git log -p unless you explicitly tell git to diff
to the non-default parent, so they inevitably cause confusion.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.wikimedia.org/pipermail/teampractices/attachments/20160318/7ba8f1ca/attachment.html>