[Tails-l10n] nice merge howto

intrigeri:

[...]
> OK, thanks. I've merged your branch but in the future:

[...]

>

>    … while the commit message suggests it does only #3.
>    Perhaps you're using some Git expert feature a bit
>    over-enthusiastically? :)

While waxing on and off on the Internet classroom, I found a great howto that wanted to share with you translator/gitcowgirls:

https://haacked.com/archive/2014/02/21/reviewing-merge-commits/