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

when manually saving a profile, we need to restart the backup
(incremental) cycle since e.g. adding a new dir would otherwise
not save its content on the next run

(cherry picked from commit 9a5ca69e)

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 0e03da2b)

(cherry picked from commit fd929032)

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

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 5950f39a)

(cherry picked from commit 09f04b2b)

(cherry picked from commit b306b41f)