2. BlueMind
3. bluemind/tbird
4. Changes

Could not merge the repository. 3 years ago

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 3 years ago

Changes pushed 3 years ago

The “open/mozilla/bm-connector-tb-webext/src/_locales/fr/messages.json” file was changed. 3 years ago

The “open/mozilla/bm-connector-tb-webext/src/_locales/en-US/messages.json” file was changed. 3 years ago

Changes pushed 3 years ago

Repository rebased 3 years ago

Repository rebased 3 years ago

Changes pushed 3 years ago

Fixing an alert automatically unlocked the component. 3 years ago

The component was automatically locked because of an alert. 3 years ago

Could not push the repository. 3 years ago

To ssh://stash.blue-mind.loc:7999/bm/bluemind-all.git
 ! [rejected]            master -> weblate-merge (non-fast-forward)
error: failed to push some refs to 'ssh://stash.blue-mind.loc:7999/bm/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)

3 years ago

Repository rebased 3 years ago

Changes pushed 3 years ago

Repository rebased 3 years ago

Component unlocked 3 years ago

Repository reset 3 years ago

The “open/mozilla/bm-connector-tb-webext/src/_locales/fr/messages.json” file was changed. 3 years ago