diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2019-01-05 23:38:01 +0100 |
|---|---|---|
| committer | Uwe Klotz <uklotz@mixxx.org> | 2019-01-05 23:38:01 +0100 |
| commit | 8e76a0f76cac9197efe6e33869f1464d923150fe (patch) | |
| tree | 2e02c0d51f78905f5d668923cfa6622f227b27f2 /.gitattributes | |
| parent | 56b2c05d16a7ddf893b356e4bd4562e7ceccd627 (diff) | |
Exclude Transifex (.ts/.qm) and WiX (.po) l10n files from merging
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..901a2ad9cc --- /dev/null +++ b/.gitattributes @@ -0,0 +1,14 @@ +# TODO +# Execute the following command in your local project +# directory to enable automatic merge resolution: +# +# $ git config --global merge.ours.driver true +# +# Otherwise the settings in this file are ignored! + +# Exclude Transifex files from merging +/res/translations/*.ts merge=ours +/res/translations/*.qm merge=ours + +# Exclude WiX translations from merging +/build/wix/Localization/po/*.po merge=ours |