2. BlueMind
3. bluemind/tbird
4. Changes

Rebasing (1/105)
Auto-merging open/ui/adminconsole-webapp/net.bluemind.ui.adminconsole.system/src/net/bluemind/ui/adminconsole/system/systemconf/auth/l10n/SysConfAuthConstants_fr.properties
CONFLICT (content): Merge conflict in open/ui/adminconsole-webapp/net.bluemind.ui.adminconsole.system/src/net/bluemind/ui/adminconsole/system/systemconf/auth/l10n/SysConfAuthConstants_fr.properties
error: could not apply 59a9910afe... Translated using Weblate (French)
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 59a9910afe... Translated using Weblate (French)
 (1)

4 months ago

The component was automatically locked because of an alert. 4 months ago

Could not merge the repository. 4 months ago

Rebasing (1/105)
Auto-merging open/ui/adminconsole-webapp/net.bluemind.ui.adminconsole.system/src/net/bluemind/ui/adminconsole/system/systemconf/auth/l10n/SysConfAuthConstants_fr.properties
CONFLICT (content): Merge conflict in open/ui/adminconsole-webapp/net.bluemind.ui.adminconsole.system/src/net/bluemind/ui/adminconsole/system/systemconf/auth/l10n/SysConfAuthConstants_fr.properties
error: could not apply 59a9910afe... Translated using Weblate (French)
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 59a9910afe... Translated using Weblate (French)
 (1)

4 months ago

Component unlocked 4 months ago

Changes pushed 4 months ago

Repository has changes. 4 months ago

Changes pushed 4 months ago

Could not push the repository. 4 months ago

To ssh://gitlab.int.bluemind.net/bluemind/bluemind-all.git
 ! [rejected]              master -> weblate-merge (non-fast-forward)
error: failed to push some refs to 'ssh://gitlab.int.bluemind.net/bluemind/bluemind-all.git'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. Check out this branch and integrate the remote changes
hint: (e.g. 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
 (1)

4 months ago

Repository rebased

Original revision: 0083d9846525ddfbde5fc560385417fc4429d061
New revision: 24a56b393742275b9f310e2d8a91293e502977e8 4 months ago

Component locked 4 months ago

Changes pushed 4 months ago

Repository rebased

Original revision: 7a48283af2a4d019945eff10f546f6518b486806
New revision: 0083d9846525ddfbde5fc560385417fc4429d061 4 months ago

Repository rebased

Original revision: 81202f3c51bd515bcbf5c73616664966e80d23eb
New revision: a5093cd77cda6889584a837fb9c19b8563598f98 4 months ago

Component seems unused. 4 months ago

Repository rebased 4 months ago

Parsing of the “open/mozilla/bm-connector-tb-webext/src/_locales/zh_Hans/messages.json” file was enforced. 4 months ago

Parsing of the “open/mozilla/bm-connector-tb-webext/src/_locales/uk/messages.json” file was enforced. 4 months ago

Parsing of the “open/mozilla/bm-connector-tb-webext/src/_locales/sk/messages.json” file was enforced. 4 months ago