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"
Remove "kwin", it's repetitive and doesn't add new information. In addition to that, prefixing commits that change kcms will become more straightforward. There's more than one scheme people use, some include "kwin", some don't.