1. Protegus
2. events

Weblate could not merge upstream changes while updating the repository.

error: cannot rebase: You have unstaged changes.
error: Please commit or stash them. (1)

Typical workflow for fixing merge conflicts:

1. Commit all pending changes in Weblate and lock the translation component.
   wlc commit; wlc lock
2. Add Weblate exported repository as a remote.
   git remote add weblate https://weblate.protegus.eu/git/protegus/events/; git remote update weblate
3. Merge Weblate changes and resolve any conflicts.
   git merge weblate/master
4. Push changes into upstream repository.
   git push origin master
5. 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.