~trebelnik-stefina/cinnamon-test/+git/k3b:release/22.12

Last commit made on 2023-03-10
Get this branch:
git clone -b release/22.12 https://git.launchpad.net/~trebelnik-stefina/cinnamon-test/+git/k3b

Branch merges

Branch information

Name:
release/22.12
Repository:
lp:~trebelnik-stefina/cinnamon-test/+git/k3b

Recent commits

5bec49c... by l10n daemon script <email address hidden>

GIT_SILENT Sync po/docbooks with svn

1f84b35... by l10n daemon script <email address hidden>

GIT_SILENT Sync po/docbooks with svn

73ec4ff... by l10n daemon script <email address hidden>

GIT_SILENT made messages (after extraction)

5d94f0f... by l10n daemon script <email address hidden>

GIT_SILENT Sync po/docbooks with svn

bfa1593... by l10n daemon script <email address hidden>

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"

fcca984... by l10n daemon script <email address hidden>

GIT_SILENT made messages (after extraction)

a3590f7... by l10n daemon script <email address hidden>

GIT_SILENT Sync po/docbooks with svn

a18feb5... by l10n daemon script <email address hidden>

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"

11120ab... by l10n daemon script <email address hidden>

GIT_SILENT made messages (after extraction)

742836b... by l10n daemon script <email address hidden>

GIT_SILENT Sync po/docbooks with svn