User avatar None

Parse error

test / translations

en.ts: No such file or directory 2 weeks ago
User avatar None

Parse error

test / translations

en.ts: No such file or directory a month ago
User avatar None

Parse error

test / translations

en.ts: No such file or directory a month ago
User avatar None

Parse error

test / translations

en.ts: No such file or directory a month ago
User avatar None

Failed rebase on repository

test / translations

First, rewinding head to replay your work on top of it...
Applying: fix git recurse test
Using index info to reconstruct a base tree...
M	en.ts
M	fr.ts
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): fr.ts deleted in fix git recurse test and modified in HEAD. Version HEAD of fr.ts left in tree.
CONFLICT (modify/delete): en.ts deleted in fix git recurse test and modified in HEAD. Version HEAD of en.ts left in tree.
Removing de.ts
Removing bitbucket-pipelines.yml
Removing .gitignore
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 fix git recurse test
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 months ago
User avatar None

Received repository notification

test / translations

Bitbucket: https://bitbucket.org/a2lio/translate-aurox, develop 3 months ago
User avatar None

Failed rebase on repository

test / translations

First, rewinding head to replay your work on top of it...
Applying: fix git recurse test
Using index info to reconstruct a base tree...
M	en.ts
M	fr.ts
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): fr.ts deleted in fix git recurse test and modified in HEAD. Version HEAD of fr.ts left in tree.
CONFLICT (modify/delete): en.ts deleted in fix git recurse test and modified in HEAD. Version HEAD of en.ts left in tree.
Removing de.ts
Removing bitbucket-pipelines.yml
Removing .gitignore
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 fix git recurse test
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 months ago
User avatar None

Received repository notification

test / translations

Bitbucket: https://bitbucket.org/a2lio/translate-aurox, develop 3 months ago
User avatar None

Failed rebase on repository

test / translations

First, rewinding head to replay your work on top of it...
Applying: fix git recurse test
Using index info to reconstruct a base tree...
M	en.ts
M	fr.ts
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): fr.ts deleted in fix git recurse test and modified in HEAD. Version HEAD of fr.ts left in tree.
CONFLICT (modify/delete): en.ts deleted in fix git recurse test and modified in HEAD. Version HEAD of en.ts left in tree.
Removing de.ts
Removing bitbucket-pipelines.yml
Removing .gitignore
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 fix git recurse test
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)
4 months ago
User avatar None

Received repository notification

test / translations

Bitbucket: https://bitbucket.org/a2lio/translate-aurox, develop 4 months ago
User avatar None

Failed rebase on repository

test / translations

First, rewinding head to replay your work on top of it...
Applying: fix git recurse test
Using index info to reconstruct a base tree...
M	en.ts
M	fr.ts
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): fr.ts deleted in fix git recurse test and modified in HEAD. Version HEAD of fr.ts left in tree.
CONFLICT (modify/delete): en.ts deleted in fix git recurse test and modified in HEAD. Version HEAD of en.ts left in tree.
Removing de.ts
Removing bitbucket-pipelines.yml
Removing .gitignore
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 fix git recurse test
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)
4 months ago
User avatar None

Received repository notification

test / translations

Bitbucket: https://bitbucket.org/a2lio/translate-aurox, develop 4 months ago
User avatar None

Failed rebase on repository

test / translations

First, rewinding head to replay your work on top of it...
Applying: fix git recurse test
Using index info to reconstruct a base tree...
M	en.ts
M	fr.ts
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): fr.ts deleted in fix git recurse test and modified in HEAD. Version HEAD of fr.ts left in tree.
CONFLICT (modify/delete): en.ts deleted in fix git recurse test and modified in HEAD. Version HEAD of en.ts left in tree.
Removing de.ts
Removing bitbucket-pipelines.yml
Removing .gitignore
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 fix git recurse test
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)
4 months ago
User avatar None

Received repository notification

test / translations

Bitbucket: https://bitbucket.org/a2lio/translate-aurox, develop 4 months ago
User avatar None

Failed rebase on repository

test / translations

First, rewinding head to replay your work on top of it...
Applying: fix git recurse test
Using index info to reconstruct a base tree...
M	en.ts
M	fr.ts
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): fr.ts deleted in fix git recurse test and modified in HEAD. Version HEAD of fr.ts left in tree.
CONFLICT (modify/delete): en.ts deleted in fix git recurse test and modified in HEAD. Version HEAD of en.ts left in tree.
Removing de.ts
Removing bitbucket-pipelines.yml
Removing .gitignore
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 fix git recurse test
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)
4 months ago
User avatar None

Received repository notification

test / translations

Bitbucket: https://bitbucket.org/a2lio/translate-aurox, develop 4 months ago
User avatar None

Failed rebase on repository

test / translations

First, rewinding head to replay your work on top of it...
Applying: fix git recurse test
Using index info to reconstruct a base tree...
M	en.ts
M	fr.ts
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): fr.ts deleted in fix git recurse test and modified in HEAD. Version HEAD of fr.ts left in tree.
CONFLICT (modify/delete): en.ts deleted in fix git recurse test and modified in HEAD. Version HEAD of en.ts left in tree.
Removing de.ts
Removing bitbucket-pipelines.yml
Removing .gitignore
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 fix git recurse test
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)
6 months ago
User avatar None

Received repository notification

test / translations

Bitbucket: https://bitbucket.org/a2lio/translate-aurox, develop 6 months ago
User avatar None

Failed rebase on repository

test / translations

First, rewinding head to replay your work on top of it...
Applying: fix git recurse test
Using index info to reconstruct a base tree...
M	en.ts
M	fr.ts
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): fr.ts deleted in fix git recurse test and modified in HEAD. Version HEAD of fr.ts left in tree.
CONFLICT (modify/delete): en.ts deleted in fix git recurse test and modified in HEAD. Version HEAD of en.ts left in tree.
Removing de.ts
Removing bitbucket-pipelines.yml
Removing .gitignore
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 fix git recurse test
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)
6 months ago
User avatar None

Received repository notification

test / translations

Bitbucket: https://bitbucket.org/a2lio/translate-aurox, develop 6 months ago

Search