not sure why they would happen but someone managed to 🤷

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"

this adds sentry support for evaluation. limited to form-git builds and
explicit opt-ins. testing sentry was agreed upon a while ago on the
community mailing list. the hope is that it will improve our crash
handling experience enough to potentially replace bugzilla as crash
tracking system.

QVariant <-> const char* doesn't work there anymore, so make this more
explicit.

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

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 latter (KF5ConfigGui to be precise) is needed for KWindowConfig in
drkonqidialog.cpp and was most likely implicitly pulled in before and
mistaken with KConfigWidgets, which isn't used at all.

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"

app restarts have nothing to do with trace reload. probably was bad copy
paste from the restart button

BUG: 454927

Aleix Pol Gonzalez authored May 26, 2022 and Aleix Pol Gonzalez committed May 27, 2022

It can make it easier to find what you're looking for

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"

this was not possible in the original implementation but we can now
easily allow this thanks to the pagestack, which will take care that the
page order is still reasonable

BUG: 453989

Simplifies the access to this actions, which are meant mainly
for developers but can also help bug reporters if they're asked
to submit backtraces.

Otherwise the backtrace area looks a bit broken, surrounded by
all of the empty space

GIT_SILENT

was not connected to anything and consequently did nothing

GIT_SILENT

snuck by accident when merging

usefulness changes as the first lines trickle in, leading to the status
item saying things are useless when indeed it's not done loading yet.

BUG: 453538

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"

lest distros miss them

:? returns the var if defined or errors if undefined. so we need to
assign the output back into the var, otherwise we'd try to implicitly
run the content of the variable (and that is a dir so it makes zero
sense - plus is not what is intended here anyway)

the old qwidget UI sticks around for safer mode (for now) just in case
the qml view goes belly up.

BUG: 443781

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"

this is still a bit crap because you can't scroll horizontally because
that gesture is already used for switching pages. so. I don't know, but
this is certainly better than doing text selection on mobile 🤷

the user socket also needs to be enabled otherwise the processor has
nobody to talk to

apparently 0-123-0 is the escaped variant (%i) whereas I thought it is
the unescaped variant (%I). since we want the version with hyphens (so
we can use them in the filtering tech) use %i here.

unit names always have a type suffix, in this case the instance is the
prefix (so we can startwith filter on) meaning we need to add the suffix
manually for the builtin matching tech

it indeed serves no practical purpose and is actually counterproductive
for the coredump-gui

3 numbers but 2 hyphens. one can see where my brain took the wrong turn
;)

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"