GitLab

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

(cherry picked from commit 42d82c9c)

AVCodec is const in FFmpeg 5

BUG: 448776

(cherry picked from commit fabeb36a)

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

(cherry picked from commit c9002883)

(cherry picked from commit 9bc02fcc)

(cherry picked from commit 4953a60b)

(cherry picked from commit 248a1669)

The options are very undiscoverable in dolphin and having
an option for this seems quite overkill to me. If people really want to
have this kind of configurability they should be using an image
viewer instead of looking at the thumbnails.

For compatibility the config file is still read.

It also causes issues from a dependency kind of view.
Task: https://phabricator.kde.org/T14695

(cherry picked from commit 912688dc)

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 57253cdd)

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"

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"

GIT_SILENT

GIT_SILENT

GIT_SILENT

GIT_SILENT

GIT_SILENT

GIT_SILENT

GIT_SILENT

GIT_SILENT

GIT_SILENT