kdeconnect-desktop:work/apollozhu/fix-share-metadata

Last commit made on 2023-04-20
Get this branch:
git clone -b work/apollozhu/fix-share-metadata https://git.launchpad.net/kdeconnect-desktop

Branch merges

Branch information

Name:
work/apollozhu/fix-share-metadata
Repository:
lp:kdeconnect-desktop

Recent commits

5e3569c... by Apollo Zhu <email address hidden>

Fix swapped creationTime and lastModified

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

GIT_SILENT Sync po/docbooks with svn

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

GIT_SILENT Sync po/docbooks with svn

5da47e9... 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"

2b3d0d4... by l10n daemon script <email address hidden>

GIT_SILENT Sync po/docbooks with svn

cb19b72... 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"

9f9cbf9... by l10n daemon script <email address hidden>

GIT_SILENT Sync po/docbooks with svn

f5e9370... 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"

981f247... by l10n daemon script <email address hidden>

GIT_SILENT Sync po/docbooks with svn

3b42d0f... 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"