| commit | cd7894e764fb63dbb813346d1244c6a1054c508e | |
| author | l10n daemon script <scripty@kde.org> | |
| Tue, 13 Sep 2016 13:01:05 +0000 (13 13:01 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Tue, 13 Sep 2016 13:01:05 +0000 (13 13:01 +0000) | ||
| tree | 2cca8b794cc0c7b75323aae09a158b3775b641d1 | treesnapshot (tar.gz zip) |
| parent | 70bca6e5cd9c2f2eed728c75cf683bfa1a1bd1bc | 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"