| commit | d9e5fa210d375d6364beda71e1f3e31d1149df12 | |
| author | l10n daemon script <scripty@kde.org> | |
| Thu, 10 Sep 2015 11:32:45 +0000 (10 11:32 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Thu, 10 Sep 2015 11:32:45 +0000 (10 11:32 +0000) | ||
| tree | 435c0d9570a792c1d780a170f072a156289f34e7 | treesnapshot (tar.gz zip) |
| parent | 74f3fbe342ecd8020c27b416c2097037ec20c591 | commitdiff |
SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"