User avatar 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)
04/06/2024
User avatar None

Component locked
The component was automatically locked because of an alert. 04/06/2024
User avatar None

Alert triggered
Could not merge the repository. 04/06/2024
User avatar None

Component locked
The component was automatically locked because of an alert. 04/06/2024
User avatar None

Alert triggered
Could not merge the repository. 04/06/2024
User avatar None

Component locked
The component was automatically locked because of an alert. 04/06/2024
User avatar None

Alert triggered
Could not merge the repository. 04/06/2024
User avatar None

Component locked
The component was automatically locked because of an alert. 04/06/2024
User avatar None

Alert triggered
Could not merge the repository. 04/06/2024
User avatar None

Component locked
The component was automatically locked because of an alert. 04/06/2024
User avatar None

Alert triggered
Could not merge the repository. 04/06/2024
User avatar None

Component locked
The component was automatically locked because of an alert. 04/06/2024
User avatar None

Alert triggered
Could not merge the repository. 04/06/2024
User avatar None

Component locked
The component was automatically locked because of an alert. 04/06/2024
User avatar None

Alert triggered
Could not merge the repository. 04/06/2024
User avatar None

Component locked
The component was automatically locked because of an alert. 04/06/2024
User avatar None

Alert triggered
Could not merge the repository. 04/06/2024
User avatar None

Component locked
The component was automatically locked because of an alert. 04/06/2024
User avatar None

Alert triggered
Could not merge the repository. 04/06/2024
User avatar 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)
04/06/2024

Search