lp:~neon/kde-dev-utils/master
- Get this branch:
- bzr branch lp:~neon/kde-dev-utils/master
Branch merges
Branch information
Import details
This branch is an import of the HEAD branch of the Git repository at https://invent.kde.org/sdk/kde-dev-utils.
Last successful import was 1 hour ago.
Recent revisions
- 490. By l10n daemon script <email address hidden> 14 hours ago
-
SVN_SILENT made messages (.desktop file) - always resolve ours
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" - 489. By Heiko Becker <email address hidden> on 2021-02-24
-
GIT_SILENT Update Appstream for new release
(cherry picked from commit 0d272a40e6d0e8b
51bbca29af8e538 717cc5049c) - 488. By l10n daemon script <email address hidden> on 2021-02-15
-
SVN_SILENT made messages (.desktop file) - always resolve ours
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" - 487. By Heiko Becker <email address hidden> on 2021-01-29
-
GIT_SILENT Update Appstream for new release
(cherry picked from commit ded728f7eabaa46
57e8e1e0f610d02 b8844989c6) - 486. By l10n daemon script <email address hidden> on 2021-01-21
-
SVN_SILENT made messages (.desktop file) - always resolve ours
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" - 485. By l10n daemon script <email address hidden> on 2021-01-14
-
SVN_SILENT made messages (.desktop file) - always resolve ours
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" - 484. By l10n daemon script <email address hidden> on 2021-01-12
-
SVN_SILENT made messages (.desktop file) - always resolve ours
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" - 483. By l10n daemon script <email address hidden> on 2021-01-11
-
SVN_SILENT made messages (.desktop file) - always resolve ours
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" - 482. By l10n daemon script <email address hidden> on 2021-01-06
-
SVN_SILENT made messages (.desktop file) - always resolve ours
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" - 481. By l10n daemon script <email address hidden> on 2021-01-05
-
SVN_SILENT made messages (.desktop file) - always resolve ours
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"
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)