1. Noosfero
2. Plugin: Solr

Weblate could not merge upstream changes while updating the repository.

Auto-merging public/designs/themes/base/navigation.html.erb
Auto-merging features/sensitive_content.feature
CONFLICT (add/add): Merge conflict in features/sensitive_content.feature
Auto-merging config/routes/myprofile/33_cms.rb
CONFLICT (content): Merge conflict in config/routes/myprofile/33_cms.rb
Auto-merging app/helpers/article_helper.rb
CONFLICT (content): Merge conflict in app/helpers/article_helper.rb
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/noosfero/noosfero/ 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.

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.