v2.7 : lp:~rikmills/+git/krusader-upstream : Git : Code : Rik Mills

Get this branch:: git clone -b v2.7 https://git.launchpad.net/~rikmills/+git/krusader-upstream

You will only be able to propose a merge to another personal repository with the same name.

Branch information

5b140da... by l10n daemon script <email address hidden> on 2022-10-17

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"

37f0e2b... by l10n daemon script <email address hidden> on 2022-10-17

GIT_SILENT made messages (after extraction)

4e8fe66... by l10n daemon script <email address hidden> on 2022-10-13

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"

7d834f4... by l10n daemon script <email address hidden> on 2022-10-13

GIT_SILENT made messages (after extraction)

8fa0b2a... by l10n daemon script <email address hidden> on 2022-09-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"

1f1991e... by l10n daemon script <email address hidden> on 2022-09-08

GIT_SILENT made messages (after extraction)

05ab119... by l10n daemon script <email address hidden> on 2022-07-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"

d614602... by l10n daemon script <email address hidden> on 2022-06-27

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"

34b28e8... by l10n daemon script <email address hidden> on 2022-06-27

GIT_SILENT made messages (after extraction)

6f50b02... by l10n daemon script <email address hidden> on 2022-06-13

GIT_SILENT made messages (after extraction)

»