User avatar None

Failed rebase on repository

Getmonero / monero-site

First, rewinding head to replay your work on top of it...
Applying: German
Applying: German
Applying: German
Applying: Russian
Using index info to reconstruct a base tree...
M	_i18n/ru/resources/moneropedia/weblate/ring-size.po
Falling back to patching base and 3-way merge...
Auto-merging _i18n/ru/resources/moneropedia/weblate/ring-size.po
CONFLICT (content): Merge conflict in _i18n/ru/resources/moneropedia/weblate/ring-size.po
error: Failed to merge in the changes.
Patch failed at 0004 Russian
Use 'git am --show-current-patch' to see the failed patch

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".

 (128)
a year ago
User avatar HeyBroWhatsUp

Suggestion accepted

Getmonero / monero-siteChinese (Simplified)

a year ago
User avatar HeyBroWhatsUp

Suggestion accepted

Getmonero / monero-siteChinese (Simplified)

a year ago
User avatar None

Failed rebase on repository

Getmonero / monero-site

First, rewinding head to replay your work on top of it...
Applying: German
Applying: German
Applying: German
Applying: Russian
Using index info to reconstruct a base tree...
M	_i18n/ru/resources/moneropedia/weblate/ring-size.po
Falling back to patching base and 3-way merge...
Auto-merging _i18n/ru/resources/moneropedia/weblate/ring-size.po
CONFLICT (content): Merge conflict in _i18n/ru/resources/moneropedia/weblate/ring-size.po
error: Failed to merge in the changes.
Patch failed at 0004 Russian
Use 'git am --show-current-patch' to see the failed patch

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".

 (128)
a year ago
User avatar enlightenment

Suggestion accepted

Getmonero / monero-siteIndonesian

a year ago
User avatar enlightenment

Suggestion accepted

Getmonero / monero-siteIndonesian

a year ago
User avatar enlightenment

Suggestion accepted

Getmonero / monero-siteIndonesian

a year ago
User avatar pencerahan

Suggestion added

Getmonero / monero-siteIndonesian

a year ago
User avatar pencerahan

Suggestion removed

Getmonero / monero-siteIndonesian

a year ago
User avatar pencerahan

Suggestion added

Getmonero / monero-siteIndonesian

a year ago
User avatar pencerahan

Suggestion removed

Getmonero / monero-siteIndonesian

a year ago
User avatar pencerahan

Suggestion added

Getmonero / monero-siteIndonesian

a year ago
User avatar pencerahan

Suggestion removed

Getmonero / monero-siteIndonesian

a year ago
User avatar enlightenment

Suggestion accepted

Getmonero / monero-siteIndonesian

a year ago
User avatar None

Failed rebase on repository

Getmonero / monero-site

First, rewinding head to replay your work on top of it...
Applying: German
Applying: German
Applying: German
Applying: Russian
Using index info to reconstruct a base tree...
M	_i18n/ru/resources/moneropedia/weblate/ring-size.po
Falling back to patching base and 3-way merge...
Auto-merging _i18n/ru/resources/moneropedia/weblate/ring-size.po
CONFLICT (content): Merge conflict in _i18n/ru/resources/moneropedia/weblate/ring-size.po
error: Failed to merge in the changes.
Patch failed at 0004 Russian
Use 'git am --show-current-patch' to see the failed patch

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".

 (128)
a year ago
User avatar enlightenment

Suggestion accepted

Getmonero / monero-siteIndonesian

a year ago
User avatar enlightenment

Suggestion accepted

Getmonero / monero-siteIndonesian

a year ago
User avatar enlightenment

Suggestion accepted

Getmonero / monero-siteIndonesian

a year ago
User avatar enlightenment

Suggestion accepted

Getmonero / monero-siteIndonesian

a year ago
User avatar enlightenment

Suggestion accepted

Getmonero / monero-siteIndonesian

a year ago

Search