1. KDSPro
2. errors-lk

Weblate could not merge upstream changes while updating the repository.

error: Your local changes to the following files would be overwritten by checkout:
	app/components/directive/conditions-settings/conditions-settings.controller.js
	app/components/directive/conditions-settings/conditions-settings.view.html
	app/components/directive/elk/product-navigator/product-navigator.controller.js
	app/components/directive/integration-options/integration-options.controller.js
	app/components/directive/integration-options/integration-options.view.html
	app/components/directive/screen-settings/screen-settings.controller.js
	app/components/directive/screen-settings/screen-settings.view.html
	app/components/directive/style-settings/preview-css/preview-css.controller.js
	app/components/directive/style-settings/preview-css/preview-css.view.html
	app/components/directive/style-settings/style-settings.controller.js
	app/components/directive/style-settings/style-settings.view.html
	app/components/directive/timer-settings/timer-settings.controller.js
	app/components/elk/elk.controller.js
	app/components/servers/server-service.controller.js
	app/components/servers/server-service.view.html
Please, commit your changes or stash them before you can switch branches.
Aborting (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 http://weblate.ucs.ru/git/kdspro/errors-lk/; 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.

Any publicly available project should have defined license to indicate what terms apply to contributions.