 admin
Failed rebase on repository |
a year ago
|
|
admin
Failed rebase on repository |
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 closed/mapi/net.bluemind.exchange.ese/lang/folder_fr.properties Falling back to patching base and 3-way merge... Auto-merging closed/mapi/net.bluemind.exchange.ese/lang/folder_fr.properties CONFLICT (content): Merge conflict in closed/mapi/net.bluemind.exchange.ese/lang/folder_fr.properties error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Translated using Weblate (French) 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)a year ago |
 None
Component locked BlueMind / open/ui/settings-webapp/net.bluemind.ui.settings.general/src/net/bluemind/ui/settings/client/forms/H |
The component was automatically locked because of an alert.
a year ago
|
|
None
New alert BlueMind / open/ui/settings-webapp/net.bluemind.ui.settings.general/src/net/bluemind/ui/settings/client/forms/H |
Could not merge the repository.
a year ago
|
|
None
Component locked BlueMind / open/ui/IM/src/net/bluemind/ui/im/client/IMConstants |
The component was automatically locked because of an alert.
a year ago
|
|
None
New alert BlueMind / open/ui/IM/src/net/bluemind/ui/im/client/IMConstants |
Could not merge the repository.
a year ago
|
|
None
Component locked BlueMind / open/ui/adminconsole-webapp/net.bluemind.ui.adminconsole.ldap.importation/src/net/bluemind/ui/adminc |
The component was automatically locked because of an alert.
a year ago
|
|
None
New alert BlueMind / open/ui/adminconsole-webapp/net.bluemind.ui.adminconsole.ldap.importation/src/net/bluemind/ui/adminc |
Could not merge the repository.
a year ago
|
|
None
Component locked BlueMind / closed/mapi/net.bluemind.exchange.ews/OSGI-INF/l10n/bundle |
The component was automatically locked because of an alert.
a year ago
|
|
None
New alert BlueMind / closed/mapi/net.bluemind.exchange.ews/OSGI-INF/l10n/bundle |
Could not merge the repository.
a year ago
|
|
None
Component locked BlueMind / open/ui/closures/net.bluemind.history.ui.closure/src/main/lang/lang |
The component was automatically locked because of an alert.
a year ago
|
|
None
New alert BlueMind / open/ui/closures/net.bluemind.history.ui.closure/src/main/lang/lang |
Could not merge the repository.
a year ago
|
|
None
Component locked BlueMind / open/plugins/net.bluemind.lmtp.filter.imip/lang/lang |
The component was automatically locked because of an alert.
a year ago
|
|
None
New alert BlueMind / open/plugins/net.bluemind.lmtp.filter.imip/lang/lang |
Could not merge the repository.
a year ago
|
|
None
Component locked BlueMind / open/ui/vue-apps/mail-webapp/OSGI-INF/l10n/bundle |
The component was automatically locked because of an alert.
a year ago
|
|
None
New alert BlueMind / open/ui/vue-apps/mail-webapp/OSGI-INF/l10n/bundle |
Could not merge the repository.
a year ago
|
|
None
Component locked BlueMind / open/ui/adminconsole-webapp/net.bluemind.ui.adminconsole.directory/src/net/bluemind/ui/admincons 19 |
The component was automatically locked because of an alert.
a year ago
|
|
None
New alert BlueMind / open/ui/adminconsole-webapp/net.bluemind.ui.adminconsole.directory/src/net/bluemind/ui/admincons 19 |
Could not merge the repository.
a year ago
|
|
None
Component locked BlueMind / open/ui/settings-webapp/net.bluemind.ui.settings.downloads.tbird/OSGI-INF/l10n/bundle |
The component was automatically locked because of an alert.
a year ago
|
|
None
New alert BlueMind / open/ui/settings-webapp/net.bluemind.ui.settings.downloads.tbird/OSGI-INF/l10n/bundle |
Could not merge the repository.
a year ago
|