GitLab

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"

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"

Not just when a new file is opened

Parsing is hard, let the commandline parser do it

This fixes a crash when passing no args when activating

Use a generator expression so that it works properly with multi-config builds

Nicolas Fella authored Apr 20, 2022 and Carl Schwan committed Apr 20, 2022

This is now done by KQuickImageEditor