User avatar None

Changes pushed

Changes pushed a year ago
User avatar None

Repository rebase failed

First, rewinding head to replay your work on top of it...
Applying: Added translation using Weblate (Bengali)
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging app/src/main/res/values-bn/strings.xml
CONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Added translation using Weblate (Bengali)

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
User avatar None

Changes pushed

Changes pushed a year ago
User avatar None

Repository rebase failed

First, rewinding head to replay your work on top of it...
Applying: Added translation using Weblate (Bengali)
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging app/src/main/res/values-bn/strings.xml
CONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Added translation using Weblate (Bengali)

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
User avatar None

Changes pushed

Changes pushed a year ago
User avatar None

Repository rebase failed

First, rewinding head to replay your work on top of it...
Applying: Added translation using Weblate (Bengali)
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging app/src/main/res/values-bn/strings.xml
CONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Added translation using Weblate (Bengali)

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
User avatar None

Changes pushed

Changes pushed a year ago
User avatar None

Repository rebase failed

First, rewinding head to replay your work on top of it...
Applying: Added translation using Weblate (Bengali)
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging app/src/main/res/values-bn/strings.xml
CONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Added translation using Weblate (Bengali)

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
User avatar None

Changes pushed

Changes pushed a year ago
User avatar None

Repository rebase failed

First, rewinding head to replay your work on top of it...
Applying: Added translation using Weblate (Bengali)
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging app/src/main/res/values-bn/strings.xml
CONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Added translation using Weblate (Bengali)

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
User avatar None

Changes pushed

Changes pushed a year ago
User avatar None

Repository rebase failed

First, rewinding head to replay your work on top of it...
Applying: Added translation using Weblate (Bengali)
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging app/src/main/res/values-bn/strings.xml
CONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Added translation using Weblate (Bengali)

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
User avatar None

Changes pushed

Changes pushed a year ago
User avatar None

Repository rebase failed

First, rewinding head to replay your work on top of it...
Applying: Added translation using Weblate (Bengali)
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging app/src/main/res/values-bn/strings.xml
CONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Added translation using Weblate (Bengali)

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
User avatar None

Changes pushed

Changes pushed a year ago
User avatar None

Repository rebase failed

First, rewinding head to replay your work on top of it...
Applying: Added translation using Weblate (Bengali)
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging app/src/main/res/values-bn/strings.xml
CONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Added translation using Weblate (Bengali)

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
User avatar trendspotter

Translation changed

a year ago
User avatar trendspotter

Translation changed

a year ago
User avatar trendspotter

Translation changed

a year ago
User avatar trendspotter

Translation changed

a year ago

Search