GitLab

(cherry picked from commit 8a14b433)

(cherry picked from commit 3b530c47)

BUG: 451754

Reported-by: Duncan <1i5t5.duncan@cox.net>
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

(cherry picked from commit 565cf154)

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 eb3faac6)

Signed-off-by: Snehit Sah <snehitsah@protonmail.com>

(cherry picked from commit 0077a55e)

(cherry picked from commit 51b900f2)

(cherry picked from commit 3892b758)

(cherry picked from commit 2968a8a3)

And omit value argument, which is true by default anyway.

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 a97d7f76)

Also add/move license files as required by REUSE specification.

GIT_SILENT

GIT_SILENT

GIT_SILENT