jorgesumle
Suggestion added |
|
jorgesumle
Suggestion accepted |
|
jorgesumle
Suggestion accepted |
|
jorgesumle
Suggestion accepted |
|
jorgesumle
Suggestion accepted |
|
jorgesumle
Suggestion accepted |
|
jorgesumle
Suggestion accepted |
|
jorgesumle
Suggestion accepted |
|
jorgesumle
Suggestion added |
|
jorgesumle
Suggestion accepted |
|
davidol
Suggestion added |
|
davidol
Suggestion added |
|
davidol
Suggestion added |
|
davidol
Suggestion added |
|
None
Failed rebase on repository |
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 |
davidol
Suggestion added |
|
davidol
Suggestion added |
|
davidol
Suggestion accepted |
|
davidol
Suggestion accepted |
|
davidol
Suggestion accepted |
|