GitLab

(cherry picked from commit d5f40100)

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"

(cherry picked from commit 8149cb65)

That's the binary factory default configuration.

(cherry picked from commit 6ee85a2a)

(cherry picked from commit 9172dacf)

(cherry picked from commit a8e1dcca)

(cherry picked from commit b5347ad7)

(cherry picked from commit 939776ef)

(cherry picked from commit ed3c8ae7)

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"

(cherry picked from commit 1327e468)

(cherry picked from commit ea66f8fb)

(cherry picked from commit cbdd1eff)

(cherry picked from commit 1c7afcf2)

(cherry picked from commit f617ef9c)

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"