![]() Changes pushed |
Changes pushed
3 years ago
|
![]() Changes pushed |
Changes pushed
3 years ago
|
![]() Changes pushed |
Changes pushed
3 years ago
|
![]() Changes pushed |
Changes pushed
3 years ago
|
![]() Translation added |
|
![]() Translation added |
|
![]() Component unlocked |
Component unlocked
3 years ago
|
![]() Component locked |
Component locked
3 years ago
|
![]() Repository reset |
Repository reset
3 years ago
|
![]() Resource updated |
The “
signature/net.bluemind.ui.signature.application/l10n/files/de.json ” file was changed.
3 years ago
|
![]() Component unlocked |
Fixing an alert automatically unlocked the component.
3 years ago
|
![]() Repository rebased |
Repository rebased
3 years ago
|
![]() Repository rebase failed |
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (German) Using index info to reconstruct a base tree... M signature/net.bluemind.ui.signature.application/l10n/files/de.json Falling back to patching base and 3-way merge... Auto-merging signature/net.bluemind.ui.signature.application/l10n/files/de.json CONFLICT (content): Merge conflict in signature/net.bluemind.ui.signature.application/l10n/files/de.json 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 (German) 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 |
![]() Repository rebase failed |
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (German) Using index info to reconstruct a base tree... M signature/net.bluemind.ui.signature.application/l10n/files/de.json Falling back to patching base and 3-way merge... Auto-merging signature/net.bluemind.ui.signature.application/l10n/files/de.json CONFLICT (content): Merge conflict in signature/net.bluemind.ui.signature.application/l10n/files/de.json 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 (German) 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 |
![]() Repository rebase failed |
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (German) Using index info to reconstruct a base tree... M signature/net.bluemind.ui.signature.application/l10n/files/de.json Falling back to patching base and 3-way merge... Auto-merging signature/net.bluemind.ui.signature.application/l10n/files/de.json CONFLICT (content): Merge conflict in signature/net.bluemind.ui.signature.application/l10n/files/de.json 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 (German) 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 |
![]() Repository rebase failed |
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (German) Using index info to reconstruct a base tree... M signature/net.bluemind.ui.signature.application/l10n/files/de.json Falling back to patching base and 3-way merge... Auto-merging signature/net.bluemind.ui.signature.application/l10n/files/de.json CONFLICT (content): Merge conflict in signature/net.bluemind.ui.signature.application/l10n/files/de.json 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 (German) 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 |
![]() Repository rebase failed |
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (German) Using index info to reconstruct a base tree... M signature/net.bluemind.ui.signature.application/l10n/files/de.json Falling back to patching base and 3-way merge... Auto-merging signature/net.bluemind.ui.signature.application/l10n/files/de.json CONFLICT (content): Merge conflict in signature/net.bluemind.ui.signature.application/l10n/files/de.json 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 (German) 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 |
![]() Repository rebase failed |
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (German) Using index info to reconstruct a base tree... M signature/net.bluemind.ui.signature.application/l10n/files/de.json Falling back to patching base and 3-way merge... Auto-merging signature/net.bluemind.ui.signature.application/l10n/files/de.json CONFLICT (content): Merge conflict in signature/net.bluemind.ui.signature.application/l10n/files/de.json 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 (German) 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 |
![]() Component locked |
The component was automatically locked because of an alert.
3 years ago
|
![]() Alert triggered |
Could not merge the repository.
3 years ago
|