You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
For a merge conflict the following guide is displayed by weblate (here for repo admin)
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 https://weblate.iobroker.net/git/adapters/admin/ ; git remote update weblate
Merge Weblate changes and resolve any conflicts.
git merge weblate/main
Push changes into upstream repository.
git push origin main
Weblate should now be able to see updated repository and you can unlock it.
wlc pull ; wlc unlock
[Check the FAQ for info on how to resolve this.](https://docs.weblate.org/en/weblate-4.12.2/faq.html#merge)
a) instead of or additional to wlc commands hints to the corresponding area at weltae webpage should be given (Users normally do not have access to commandline at weblate system)
b) git merge weblate/main and git push origin main should either use the correct head name (main OR master) or use soe syntax like main/master to guide inexperianced users.
c) In addition please add the following info : (c) UncleSamSwiss Um von Weblate Git pullen zu können, musst du deinen API Key und den Benutzer von Weblate benutzen.
The text was updated successfully, but these errors were encountered:
For a merge conflict the following guide is displayed by weblate (here for repo admin)
a) instead of or additional to wlc commands hints to the corresponding area at weltae webpage should be given (Users normally do not have access to commandline at weblate system)
b) git merge weblate/main and git push origin main should either use the correct head name (main OR master) or use soe syntax like main/master to guide inexperianced users.
c) In addition please add the following info : (c) UncleSamSwiss
Um von Weblate Git pullen zu können, musst du deinen API Key und den Benutzer von Weblate benutzen.
The text was updated successfully, but these errors were encountered: