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"

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"

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"

Summary:
Activate actions when opening context menu before directly selecting
any scratch.

Reviewers: #kdevelop, arrowd

Reviewed By: arrowd

Subscribers: kdevelop-devel

Tags: #kdevelop

Differential Revision: https://phabricator.kde.org/D18216

Summary: Add "Run Scratch" action to main window and thus allow configuring it.

Reviewers: kfunk

Reviewed By: kfunk

Subscribers: arrowd, kdevelop-devel

Tags: #kdevelop

Differential Revision: https://phabricator.kde.org/D17569

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"

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"

Summary: In response to b13e7010

Reviewers: kfunk, kossebau

Reviewed By: kfunk

Subscribers: kdevelop-devel

Tags: #kdevelop

Differential Revision: https://phabricator.kde.org/D17575

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"

Summary:
Adds a scratchpad plugin, which allows you to keep "scratches" of code/text
to experiment or quickly run something without the need for a project.
The plugin adds a new tool-view, which will maintain a list of your scratches
as well as allowing you to compile and run them.
The scratches live in the directory `scratches` in the data directory and
are regular documents so we get all the editing convenience of code-completion
and diagnostics.
Commands used to run them are saved per-scratches and new scratches use the last
used command for that file type/suffix.

FEATURE: 176389

Test Plan:
Add the tool-view on the left tool bar and try creating and using the scratches.
Currently no automated tests.

Reviewers: #kdevelop, kfunk

Reviewed By: #kdevelop, kfunk

Subscribers: aaronpuchert, kfunk, gregormi, brauch, kdevelop-devel

Tags: #kdevelop

Differential Revision: https://phabricator.kde.org/D16484