Quantcast
Channel: KUserFeedback:42235444fd76ff4c75f8a3acfcf2684867610b12 commits
Viewing all articles
Browse latest Browse all 29

SVN_SILENT made messages (.desktop file) - always resolve ours

$
0
0
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"

Viewing all articles
Browse latest Browse all 29

Trending Articles