From: Francisco Vila Date: Wed, 2 May 2012 10:57:06 +0000 (+0200) Subject: Merge branch 'Paco' into staging X-Git-Tag: release/2.15.38-1~3 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=af60e9b57f205a3c2e044ac8db351b42ef3e26ad;p=lilypond.git Merge branch 'Paco' into staging Conflicts: Documentation/contributor/doc-work.itexi Documentation/contributor/source-code.itexi --- af60e9b57f205a3c2e044ac8db351b42ef3e26ad diff --cc Documentation/contributor/source-code.itexi index 97e1025e47,032bb9b7d4..e0ce2c26bf --- a/Documentation/contributor/source-code.itexi +++ b/Documentation/contributor/source-code.itexi @@@ -1019,12 -1019,12 +1019,11 @@@ git merge @var{foo If any conflict happens, see @ref{Resolving conflicts}. --There are common usage cases for merging: as a translator, you - will often want to merge @code{master} into -will often want the Translations meister to merge @code{master} into --@code{translation}; on the other hand, the Translations --meister wants to merge @code{translation} into - @code{master} whenever he has checked that -@code{staging} whenever he has checked that --@code{translation} builds successfully. ++There are common usage cases for merging: as a translator, you will ++often want the Translations meister to merge @code{master} into ++@code{translation}; on the other hand, the Translations meister wants ++to merge @code{translation} into @code{staging} whenever he has ++checked that @code{translation} builds successfully. @node Commits and patches