kompare

lp:~neon/kompare/master

Created by Philip Muškovac on 2013-02-11 and last modified on 2020-07-23
Get this branch:
bzr branch lp:~neon/kompare/master

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Deprecated Projected Neon
Project:
kompare
Status:
Development

Import details

Import Status: Reviewed

This branch is an import of the HEAD branch of the Git repository at https://invent.kde.org/sdk/kompare.

The next import is scheduled to run in 2 hours.

Last successful import was 3 hours ago.

Import started 3 hours ago on alnitak and finished 3 hours ago taking 20 seconds — see the log
Import started 9 hours ago on alnitak and finished 9 hours ago taking 20 seconds — see the log
Import started 15 hours ago on izar and finished 15 hours ago taking 15 seconds — see the log
Import started 21 hours ago on alnitak and finished 21 hours ago taking 20 seconds — see the log
Import started on 2020-08-06 on izar and finished on 2020-08-06 taking 20 seconds — see the log
Import started on 2020-08-06 on alnitak and finished on 2020-08-06 taking 25 seconds — see the log
Import started on 2020-08-06 on alnitak and finished on 2020-08-06 taking 25 seconds — see the log
Import started on 2020-08-06 on izar and finished on 2020-08-06 taking 20 seconds — see the log
Import started on 2020-08-05 on alnitak and finished on 2020-08-05 taking 20 seconds — see the log
Import started on 2020-08-05 on izar and finished on 2020-08-05 taking 20 seconds — see the log

Recent revisions

1021. By l10n daemon script <email address hidden> on 2020-07-23

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"

1020. By l10n daemon script <email address hidden> on 2020-07-23

GIT_SILENT made messages (after extraction)

1019. By l10n daemon script <email address hidden> on 2020-06-24

GIT_SILENT made messages (after extraction)

1018. By Friedrich W. H. Kossebau <email address hidden> on 2020-06-20

Merge branch 'release/20.04'

1017. By l10n daemon script <email address hidden> on 2020-06-18

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"

1016. By l10n daemon script <email address hidden> on 2020-06-18

GIT_SILENT made messages (after extraction)

1015. By l10n daemon script <email address hidden> on 2020-06-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"

1014. By l10n daemon script <email address hidden> on 2020-06-17

GIT_SILENT made messages (after extraction)

1013. By l10n daemon script <email address hidden> on 2020-06-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"

1012. By l10n daemon script <email address hidden> on 2020-06-15

GIT_SILENT made messages (after extraction)

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
This branch contains Public information 
Everyone can see this information.