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"

state more prominently we want either LGPLv2+ or MIT, unfortunately we are stuck with a lot more different licenses ;)

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"

BUG: 426605

BUG: 426042

this allows to have the "old" behavior of pre 20.08 as option

it is not exactly the same as in e.g. 20.04, as we still use the normal QTabBar,
but it should feel equivalent enough

as positive side effect, the user is no able to configure how many
tabs he wants to have as maximum, default is 0, aka unlimited,
before this was based on same heuristics

BUG: 426520

When an upstream repository is changed, the snippets plugin makes a copy in the personal data dir.
Unfortunately, changes are often detected without any real modification. Importantly, a "rename" is
often triggered simply by clicking on a repository name.

This patch disregards such spurious "changes", and also clarifies the corresponding message a bit.

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"

The whole concept is almost unused and there's no point in having it there but empty

See also https://phabricator.kde.org/T13553

(cherry picked from commit 75d986c1)

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"

It is about to be deprecated

See https://phabricator.kde.org/T12177

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

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"