diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2019-01-10 23:02:28 +0100 |
|---|---|---|
| committer | Uwe Klotz <uklotz@mixxx.org> | 2019-01-10 23:06:47 +0100 |
| commit | f91ef68db80bc04927dcd9885a1b03807b17b38a (patch) | |
| tree | 3114857f9cc9c7fa67f6567e8d775a78831902f6 /.gitattributes | |
| parent | 8e76a0f76cac9197efe6e33869f1464d923150fe (diff) | |
Describe how and why to exclude l10n files from merging
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index 901a2ad9cc..75da1b1fa1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5,6 +5,15 @@ # $ git config --global merge.ours.driver true # # Otherwise the settings in this file are ignored! +# +# Background: Localization files from external sources like +# Transifex must not be merged between release branches and +# should be ignore while merging! Instead those files are +# updated by re-importing them manually from the external +# source. This workflow is supported by configuring the merge +# strategy for the local Git repository appropriately, i.e. +# by excluding those files from merging and always keeping the +# files from the current/target branch (= "ours"). # Exclude Transifex files from merging /res/translations/*.ts merge=ours |