diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2019-01-12 10:09:39 +0100 |
|---|---|---|
| committer | Uwe Klotz <uklotz@mixxx.org> | 2019-01-12 10:09:39 +0100 |
| commit | 810a29e9f56f8d3cf2cb1b66118b84d092be06b8 (patch) | |
| tree | d4859f51732b410c809823f548bca52046a07fd1 /.gitattributes | |
| parent | f91ef68db80bc04927dcd9885a1b03807b17b38a (diff) | |
Revise instructions about how to exclude l10n files from Git merge
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/.gitattributes b/.gitattributes index 75da1b1fa1..db2d848cb1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,10 +1,12 @@ -# TODO # Execute the following command in your local project -# directory to enable automatic merge resolution: +# directory to exclude localization files from merges +# across branches: # # $ git config --global merge.ours.driver true # -# Otherwise the settings in this file are ignored! +# This command sets a shell script that is used for all +# merge=ours files. In this case the script "true" does +# not touch anything, just returns successful. # # Background: Localization files from external sources like # Transifex must not be merged between release branches and |