2. admin
3. Changes

Component locked a year ago

Component locked a year ago

Component locked a year ago

Component locked a year ago

Component locked a year ago

Component locked a year ago

Component locked a year ago

Pushed changes a year ago

Pushed changes a year ago

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Spanish)
Using index info to reconstruct a base tree...
A	i18n/l10n/es.json
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): i18n/l10n/es.json deleted in HEAD and modified in Translated using Weblate (Spanish). Version Translated using Weblate (Spanish) of i18n/l10n/es.json left in tree.
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 (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)

a year 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	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

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Spanish)
Using index info to reconstruct a base tree...
A	i18n/l10n/es.json
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): i18n/l10n/es.json deleted in HEAD and modified in Translated using Weblate (Spanish). Version Translated using Weblate (Spanish) of i18n/l10n/es.json left in tree.
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 (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)

a year ago

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

a year ago