Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Weblate small error / enhancement in correction guide #10

Open
mcm1957 opened this issue Oct 12, 2023 · 0 comments
Open

Weblate small error / enhancement in correction guide #10

mcm1957 opened this issue Oct 12, 2023 · 0 comments

Comments

@mcm1957
Copy link
Contributor

mcm1957 commented Oct 12, 2023

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant