Could not merge the repository.
Weblate could not merge upstream changes while updating the repository.
error: Failed to merge in the changes. (128)
Typical workflow for fixing merge conflicts:
-
Commit all pending changes in Weblate and lock the translation component.
wlc commit; wlc lock -
Add Weblate exported repository as a remote.
git remote add weblate http://weblate.ucs.ru/git/kiosk2/core/; git remote update weblate -
Merge Weblate changes and resolve any conflicts.
git merge weblate/master -
Push changes into upstream repository.
git push origin master -
Weblate should now be able to see updated repository and you can unlock it.
wlc pull ; wlc unlock
License information missing.
Any publicly available project should have defined license to indicate what terms apply to contributions.
| Project website | http://usc.ru | |
|---|---|---|
| Translation process |
|
|
| Repository |
git@192.168.127.111:kiosk/ucs-kiosk-core-front.git
|
|
| Repository branch | master | |
| Repository containing Weblate translations | http://weblate.ucs.ru/git/kiosk2/core/ |
|
| Filemask | localize/*_lng.xlf |
|
| Monolingual base language file | localize/en_lng.xlf |
|
| Number of strings | 39501 | |
| Number of words | 189123 | |
| Number of languages | 33 | |
| Number of source strings | 1197 | |
| Number of source words | 5731 | |
| When | User | Action | Detail | Object | |
|---|---|---|---|---|---|
| 17 hours ago | none |
Failed rebase on repository | Kiosk2/core | ||
error: Failed to merge in the changes. (128) |
|||||
| 17 hours ago | none |
Committed changes | Kiosk2/core - Ukrainian | ||
| 17 hours ago | Translation changed | Kiosk2/core - Ukrainian | |||
|
Помилка в разі, якщо не створили замовлення для поточного столу на касі. Зверніться до адміністратора
|
|||||
| 17 hours ago | Translation changed | Kiosk2/core - Ukrainian | |||
|
|
|||||
| 17 hours ago | Translation changed | Kiosk2/core - Ukrainian | |||
|
Кіоск не готовий. Спробуйте пізніше
|
|||||
| 17 hours ago | New translation | Kiosk2/core - Ukrainian | |||
|
Кіоск не готовий. Спробуйте пізніше.
|
|||||
| yesterday | none |
New component alert | Could not merge the repository. | Kiosk2/core | |
| yesterday | none |
Failed rebase on repository | Kiosk2/core | ||
error: Failed to merge in the changes. (128) |
|||||
| yesterday | none |
Committed changes | Kiosk2/core - Latvian | ||
| yesterday | none |
Committed changes | Kiosk2/core - Lithuanian | ||
none