Skip to content

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

Albert Astals Cid requested to merge work/aacid/stable_merge_being_careful into master

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"

Merge request reports