1. SoundSwitch
2. Settings

Weblate could not merge upstream changes while updating the repository.

Auto-merging SoundSwitch/Localization/SettingsStrings.zh-CHS.resx
CONFLICT (content): Merge conflict in SoundSwitch/Localization/SettingsStrings.zh-CHS.resx
Automatic merge failed; fix conflicts and then commit the result. (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://hosted.weblate.org/git/soundswitch/about/ 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.

Weblate could not push changes to the upstream repository.

To github.com:Belphemur/SoundSwitch.git
 ! [rejected]        dev -> dev (non-fast-forward)
error: failed to push some refs to 'git@github.com:Belphemur/SoundSwitch.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details. (1)

The VCS repository has many changes compared to the upstream. Please merge the changes manually or set up push to automate this.

The VCS repository is not up to date with the upstream one. Please merge changes manually or set up hooks to automate this.