diff options
| author | l10n daemon script <[email protected]> | 2025-09-28 01:39:58 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-09-28 01:39:58 +0000 |
| commit | 188659465e1500e03b676c6acb3ec2b20cb6a05d (patch) | |
| tree | f3012d3aa2ad4415c87525160f46d4c67a664bad /doc | |
| parent | 72d5d76ac96d51ba4ad816a75ed450deae26ac68 (diff) | |
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"
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions