User avatar None

Failed rebase on repository

seed4me-android-app / app

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Russian)
Using index info to reconstruct a base tree...
M	app/src/main/res/values-ru/strings.xml
Falling back to patching base and 3-way merge...
Auto-merging app/src/main/res/values-ru/strings.xml
CONFLICT (content): Merge conflict in app/src/main/res/values-ru/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 Translated using Weblate (Russian)

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)
8 months ago
User avatar None

Failed rebase on repository

seed4me-android-app / app

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Russian)
Using index info to reconstruct a base tree...
M	app/src/main/res/values-ru/strings.xml
Falling back to patching base and 3-way merge...
Auto-merging app/src/main/res/values-ru/strings.xml
CONFLICT (content): Merge conflict in app/src/main/res/values-ru/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 Translated using Weblate (Russian)

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)
8 months ago
User avatar None

Failed rebase on repository

seed4me-android-app / app

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Russian)
Using index info to reconstruct a base tree...
M	app/src/main/res/values-ru/strings.xml
Falling back to patching base and 3-way merge...
Auto-merging app/src/main/res/values-ru/strings.xml
CONFLICT (content): Merge conflict in app/src/main/res/values-ru/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 Translated using Weblate (Russian)

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)
8 months ago
User avatar None

Failed rebase on repository

seed4me-android-app / app

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Russian)
Using index info to reconstruct a base tree...
M	app/src/main/res/values-ru/strings.xml
Falling back to patching base and 3-way merge...
Auto-merging app/src/main/res/values-ru/strings.xml
CONFLICT (content): Merge conflict in app/src/main/res/values-ru/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 Translated using Weblate (Russian)

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)
8 months ago
User avatar None

Failed rebase on repository

seed4me-android-app / app

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Russian)
Using index info to reconstruct a base tree...
M	app/src/main/res/values-ru/strings.xml
Falling back to patching base and 3-way merge...
Auto-merging app/src/main/res/values-ru/strings.xml
CONFLICT (content): Merge conflict in app/src/main/res/values-ru/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 Translated using Weblate (Russian)

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)
8 months ago
User avatar None

Failed rebase on repository

seed4me-android-app / app

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Russian)
Using index info to reconstruct a base tree...
M	app/src/main/res/values-ru/strings.xml
Falling back to patching base and 3-way merge...
Auto-merging app/src/main/res/values-ru/strings.xml
CONFLICT (content): Merge conflict in app/src/main/res/values-ru/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 Translated using Weblate (Russian)

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)
8 months ago
User avatar None

Failed rebase on repository

seed4me-android-app / app

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Russian)
Using index info to reconstruct a base tree...
M	app/src/main/res/values-ru/strings.xml
Falling back to patching base and 3-way merge...
Auto-merging app/src/main/res/values-ru/strings.xml
CONFLICT (content): Merge conflict in app/src/main/res/values-ru/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 Translated using Weblate (Russian)

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)
8 months ago
User avatar None

Failed rebase on repository

seed4me-android-app / app

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Russian)
Using index info to reconstruct a base tree...
M	app/src/main/res/values-ru/strings.xml
Falling back to patching base and 3-way merge...
Auto-merging app/src/main/res/values-ru/strings.xml
CONFLICT (content): Merge conflict in app/src/main/res/values-ru/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 Translated using Weblate (Russian)

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)
8 months ago

Private Wealth Management Firms in Chicago - Virtue Asset Management | Management Wealth; Virtue Asset Management is a top private wealth management firm in Chicago, providing tailored financial strategies for high-net-worth individuals and families. Discover why we are one of the leading firms in Chicago.

8 months ago

domain [url=https://google.com/]domain[/url] domain [http://www.example.com link title]

8 months ago
User avatar None

Failed rebase on repository

seed4me-android-app / app

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Russian)
Using index info to reconstruct a base tree...
M	app/src/main/res/values-ru/strings.xml
Falling back to patching base and 3-way merge...
Auto-merging app/src/main/res/values-ru/strings.xml
CONFLICT (content): Merge conflict in app/src/main/res/values-ru/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 Translated using Weblate (Russian)

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)
8 months ago
User avatar None

Failed rebase on repository

seed4me-android-app / app

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Russian)
Using index info to reconstruct a base tree...
M	app/src/main/res/values-ru/strings.xml
Falling back to patching base and 3-way merge...
Auto-merging app/src/main/res/values-ru/strings.xml
CONFLICT (content): Merge conflict in app/src/main/res/values-ru/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 Translated using Weblate (Russian)

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)
8 months ago
User avatar None

Failed rebase on repository

seed4me-android-app / app

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Russian)
Using index info to reconstruct a base tree...
M	app/src/main/res/values-ru/strings.xml
Falling back to patching base and 3-way merge...
Auto-merging app/src/main/res/values-ru/strings.xml
CONFLICT (content): Merge conflict in app/src/main/res/values-ru/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 Translated using Weblate (Russian)

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)
8 months ago
User avatar None

Failed rebase on repository

seed4me-android-app / app

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Russian)
Using index info to reconstruct a base tree...
M	app/src/main/res/values-ru/strings.xml
Falling back to patching base and 3-way merge...
Auto-merging app/src/main/res/values-ru/strings.xml
CONFLICT (content): Merge conflict in app/src/main/res/values-ru/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 Translated using Weblate (Russian)

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)
8 months ago
User avatar None

Failed rebase on repository

seed4me-android-app / app

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Russian)
Using index info to reconstruct a base tree...
M	app/src/main/res/values-ru/strings.xml
Falling back to patching base and 3-way merge...
Auto-merging app/src/main/res/values-ru/strings.xml
CONFLICT (content): Merge conflict in app/src/main/res/values-ru/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 Translated using Weblate (Russian)

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)
8 months ago
User avatar None

Failed rebase on repository

seed4me-android-app / app

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Russian)
Using index info to reconstruct a base tree...
M	app/src/main/res/values-ru/strings.xml
Falling back to patching base and 3-way merge...
Auto-merging app/src/main/res/values-ru/strings.xml
CONFLICT (content): Merge conflict in app/src/main/res/values-ru/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 Translated using Weblate (Russian)

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)
8 months ago
User avatar None

Failed rebase on repository

seed4me-android-app / app

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Russian)
Using index info to reconstruct a base tree...
M	app/src/main/res/values-ru/strings.xml
Falling back to patching base and 3-way merge...
Auto-merging app/src/main/res/values-ru/strings.xml
CONFLICT (content): Merge conflict in app/src/main/res/values-ru/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 Translated using Weblate (Russian)

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)
8 months ago
User avatar None

Failed rebase on repository

seed4me-android-app / app

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Russian)
Using index info to reconstruct a base tree...
M	app/src/main/res/values-ru/strings.xml
Falling back to patching base and 3-way merge...
Auto-merging app/src/main/res/values-ru/strings.xml
CONFLICT (content): Merge conflict in app/src/main/res/values-ru/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 Translated using Weblate (Russian)

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)
8 months ago
User avatar None

Failed rebase on repository

seed4me-android-app / app

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Russian)
Using index info to reconstruct a base tree...
M	app/src/main/res/values-ru/strings.xml
Falling back to patching base and 3-way merge...
Auto-merging app/src/main/res/values-ru/strings.xml
CONFLICT (content): Merge conflict in app/src/main/res/values-ru/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 Translated using Weblate (Russian)

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)
8 months ago
User avatar None

Failed rebase on repository

seed4me-android-app / app

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Russian)
Using index info to reconstruct a base tree...
M	app/src/main/res/values-ru/strings.xml
Falling back to patching base and 3-way merge...
Auto-merging app/src/main/res/values-ru/strings.xml
CONFLICT (content): Merge conflict in app/src/main/res/values-ru/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 Translated using Weblate (Russian)

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)
8 months ago

Search