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"
Description
Description
Details
Details
- Committed
staniek Mar 17 2017, 1:04 AM - Differential Revision
- D11778: Cool main window for KEXI 3.2
- Parents
- R71:0022e2147c9e: SVN_SILENT made messages (.desktop file) - always resolve ours
- Branches
- Unknown
- Tags