GitLab

(cherry picked from commit 6c8070cb)

(cherry picked from commit ae3a601b)

If you want git blame to ignore formatting revisions run: git config blame.ignoreRevsFile .git-blame-ignore-revs

(cherry picked from commit 55b4ef16)

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"