![]() Alert triggered |
Could not merge the repository.
3 years ago
|
![]() Component locked |
The component was automatically locked because of an alert.
3 years ago
|
![]() Alert triggered |
Could not merge the repository.
3 years ago
|
![]() Component locked |
The component was automatically locked because of an alert.
3 years ago
|
![]() Alert triggered |
Could not merge the repository.
3 years ago
|
![]() Component locked |
The component was automatically locked because of an alert.
3 years ago
|
![]() Alert triggered |
Could not merge the repository.
3 years ago
|
![]() Repository rebase failed |
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (French) Using index info to reconstruct a base tree... M open/parent/calendar/net.bluemind.calendar.helper/lang/eventAlert_fr.properties Falling back to patching base and 3-way merge... No changes -- Patch already applied. Applying: Translated using Weblate (Spanish) Using index info to reconstruct a base tree... M closed/mapi/net.bluemind.exchange.ese/lang/folder_es.properties Falling back to patching base and 3-way merge... Auto-merging closed/mapi/net.bluemind.exchange.ese/lang/folder_es.properties CONFLICT (content): Merge conflict in closed/mapi/net.bluemind.exchange.ese/lang/folder_es.properties error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0002 Translated using Weblate (Spanish) Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". (1)3 years ago |
![]() Changes committed |
Changes committed
3 years ago
|
![]() Resource updated |
The “
open/ui/settings-webapp/net.bluemind.ui.settings.general/src/net/bluemind/ui/settings/client/forms/PurgeStorageConstants_zh.properties ” file was changed.
3 years ago
|
![]() Resource updated |
The “
open/ui/settings-webapp/net.bluemind.ui.settings.general/src/net/bluemind/ui/settings/client/forms/PurgeStorageConstants_uk.properties ” file was changed.
3 years ago
|
![]() Resource updated |
The “
open/ui/settings-webapp/net.bluemind.ui.settings.general/src/net/bluemind/ui/settings/client/forms/PurgeStorageConstants_sk.properties ” file was changed.
3 years ago
|
![]() Resource updated |
The “
open/ui/settings-webapp/net.bluemind.ui.settings.general/src/net/bluemind/ui/settings/client/forms/PurgeStorageConstants_ru.properties ” file was changed.
3 years ago
|
![]() Resource updated |
The “
open/ui/settings-webapp/net.bluemind.ui.settings.general/src/net/bluemind/ui/settings/client/forms/PurgeStorageConstants_pt.properties ” file was changed.
3 years ago
|
![]() Resource updated |
The “
open/ui/settings-webapp/net.bluemind.ui.settings.general/src/net/bluemind/ui/settings/client/forms/PurgeStorageConstants_pl.properties ” file was changed.
3 years ago
|
![]() Resource updated |
The “
open/ui/settings-webapp/net.bluemind.ui.settings.general/src/net/bluemind/ui/settings/client/forms/PurgeStorageConstants_nl.properties ” file was changed.
3 years ago
|
![]() Resource updated |
The “
open/ui/settings-webapp/net.bluemind.ui.settings.general/src/net/bluemind/ui/settings/client/forms/PurgeStorageConstants_it.properties ” file was changed.
3 years ago
|
![]() Resource updated |
The “
open/ui/settings-webapp/net.bluemind.ui.settings.general/src/net/bluemind/ui/settings/client/forms/PurgeStorageConstants_hu.properties ” file was changed.
3 years ago
|
![]() Resource updated |
The “
open/ui/settings-webapp/net.bluemind.ui.settings.general/src/net/bluemind/ui/settings/client/forms/PurgeStorageConstants_fr.properties ” file was changed.
3 years ago
|
![]() Resource updated |
The “
open/ui/settings-webapp/net.bluemind.ui.settings.general/src/net/bluemind/ui/settings/client/forms/PurgeStorageConstants_es.properties ” file was changed.
3 years ago
|