lauri
Repository rebase failed |
7 months ago
|
lauri
Repository rebase failed |
Rebasing (1/9) Auto-merging HactarFull/src/main/res/raw-uk/hactar_intro_text.properties CONFLICT (add/add): Merge conflict in HactarFull/src/main/res/raw-uk/hactar_intro_text.properties error: could not apply d4a73b3d... Added translation using Weblate (Ukrainian) hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply d4a73b3d... Added translation using Weblate (Ukrainian) (1)7 months ago |
lauri
Repository merge failed |
Auto-merging HactarFull/src/main/res/raw-uk/go_capturing_text.properties CONFLICT (add/add): Merge conflict in HactarFull/src/main/res/raw-uk/go_capturing_text.properties Auto-merging HactarFull/src/main/res/raw-uk/go_connecting_text.properties CONFLICT (add/add): Merge conflict in HactarFull/src/main/res/raw-uk/go_connecting_text.properties Auto-merging HactarFull/src/main/res/raw-uk/go_end_text.properties CONFLICT (add/add): Merge conflict in HactarFull/src/main/res/raw-uk/go_end_text.properties Auto-merging HactarFull/src/main/res/raw-uk/go_ld_text.properties CONFLICT (add/add): Merge conflict in HactarFull/src/main/res/raw-uk/go_ld_text.properties Auto-merging HactarFull/src/main/res/raw-uk/hactar_intro_text.properties CONFLICT (add/add): Merge conflict in HactarFull/src/main/res/raw-uk/hactar_intro_text.properties Auto-merging HactarFull/src/main/res/raw-uk/rules_atarigo_text.properties CONFLICT (add/add): Merge conflict in HactarFull/src/main/res/raw-uk/rules_atarigo_text.properties Auto-merging HactarFull/src/main/res/raw-uk/rules_capture3_text.properties CONFLICT (add/add): Merge conflict in HactarFull/src/main/res/raw-uk/rules_capture3_text.properties Auto-merging HactarFull/src/main/res/raw-uk/rules_go_text.properties CONFLICT (add/add): Merge conflict in HactarFull/src/main/res/raw-uk/rules_go_text.properties Auto-merging HactarFull/src/main/res/values-uk/strings.xml CONFLICT (add/add): Merge conflict in HactarFull/src/main/res/values-uk/strings.xml Automatic merge failed; fix conflicts and then commit the result. (1)7 months ago |
lauri
Repository rebase failed |
Rebasing (1/9) Auto-merging HactarFull/src/main/res/raw-uk/hactar_intro_text.properties CONFLICT (add/add): Merge conflict in HactarFull/src/main/res/raw-uk/hactar_intro_text.properties error: could not apply d4a73b3d... Added translation using Weblate (Ukrainian) hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply d4a73b3d... Added translation using Weblate (Ukrainian) (1)7 months ago |
lauri
Repository rebase failed |
Rebasing (1/9) Auto-merging HactarFull/src/main/res/raw-uk/hactar_intro_text.properties CONFLICT (add/add): Merge conflict in HactarFull/src/main/res/raw-uk/hactar_intro_text.properties error: could not apply d4a73b3d... Added translation using Weblate (Ukrainian) hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply d4a73b3d... Added translation using Weblate (Ukrainian) (1)7 months ago |
lauri
Repository merge failed |
Auto-merging HactarFull/src/main/res/raw-uk/go_capturing_text.properties CONFLICT (add/add): Merge conflict in HactarFull/src/main/res/raw-uk/go_capturing_text.properties Auto-merging HactarFull/src/main/res/raw-uk/go_connecting_text.properties CONFLICT (add/add): Merge conflict in HactarFull/src/main/res/raw-uk/go_connecting_text.properties Auto-merging HactarFull/src/main/res/raw-uk/go_end_text.properties CONFLICT (add/add): Merge conflict in HactarFull/src/main/res/raw-uk/go_end_text.properties Auto-merging HactarFull/src/main/res/raw-uk/go_ld_text.properties CONFLICT (add/add): Merge conflict in HactarFull/src/main/res/raw-uk/go_ld_text.properties Auto-merging HactarFull/src/main/res/raw-uk/hactar_intro_text.properties CONFLICT (add/add): Merge conflict in HactarFull/src/main/res/raw-uk/hactar_intro_text.properties Auto-merging HactarFull/src/main/res/raw-uk/rules_atarigo_text.properties CONFLICT (add/add): Merge conflict in HactarFull/src/main/res/raw-uk/rules_atarigo_text.properties Auto-merging HactarFull/src/main/res/raw-uk/rules_capture3_text.properties CONFLICT (add/add): Merge conflict in HactarFull/src/main/res/raw-uk/rules_capture3_text.properties Auto-merging HactarFull/src/main/res/raw-uk/rules_go_text.properties CONFLICT (add/add): Merge conflict in HactarFull/src/main/res/raw-uk/rules_go_text.properties Auto-merging HactarFull/src/main/res/values-uk/strings.xml CONFLICT (add/add): Merge conflict in HactarFull/src/main/res/values-uk/strings.xml Automatic merge failed; fix conflicts and then commit the result. (1)7 months ago |
lauri
Repository rebase failed |
Rebasing (1/9) Auto-merging HactarFull/src/main/res/raw-uk/hactar_intro_text.properties CONFLICT (add/add): Merge conflict in HactarFull/src/main/res/raw-uk/hactar_intro_text.properties error: could not apply d4a73b3d... Added translation using Weblate (Ukrainian) hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply d4a73b3d... Added translation using Weblate (Ukrainian) (1)7 months ago |
lauri
Repository rebase failed |
Rebasing (1/9) Auto-merging HactarFull/src/main/res/raw-uk/hactar_intro_text.properties CONFLICT (add/add): Merge conflict in HactarFull/src/main/res/raw-uk/hactar_intro_text.properties error: could not apply d4a73b3d... Added translation using Weblate (Ukrainian) hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply d4a73b3d... Added translation using Weblate (Ukrainian) (1)7 months ago |
None
Component locked |
The component was automatically locked because of an alert.
7 months ago
|
None
Alert triggered |
Could not merge the repository.
7 months ago
|
lauri
Repository rebase failed |
Rebasing (1/9) Auto-merging HactarFull/src/main/res/raw-uk/hactar_intro_text.properties CONFLICT (add/add): Merge conflict in HactarFull/src/main/res/raw-uk/hactar_intro_text.properties error: could not apply d4a73b3d... Added translation using Weblate (Ukrainian) hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply d4a73b3d... Added translation using Weblate (Ukrainian) (1)7 months ago |
None
Resource updated |
File “
HactarFull/src/main/res/values-uk/strings.xml ” was added.
7 months ago
|
None
String added in the repository |
|
None
String added in the repository |
|
None
String added in the repository |
|
None
String added in the repository |
|
None
String added in the repository |
|
None
String added in the repository |
|
None
String added in the repository |
|
None
String added in the repository |
|