Our wiki http://udm.branchable.com/ no longer builds itself after a git push. This is what we get:
hrd@xps ~/.gits/user-data-manifesto (git)-[master] % git push origin master && git push branchable master
Décompte des objets: 7, fait.
Delta compression using up to 4 threads.
Compression des objets: 100% (6/6), fait.
Écriture des objets: 100% (7/7), 1.40 KiB | 0 bytes/s, fait.
Total 7 (delta 2), reused 0 (delta 0)
To git@github.com:userdatamanifesto/www.git
3707b70..4aa7f50 master -> master
Décompte des objets: 3, fait.
Delta compression using up to 4 threads.
Compression des objets: 100% (3/3), fait.
Écriture des objets: 100% (3/3), 796 bytes | 0 bytes/s, fait.
Total 3 (delta 1), reused 0 (delta 0)
remote: From /home/b-udm/source
remote: 70c036c..4aa7f50 master -> origin/master
remote: /home/b-udm/public_html/Discussion/index.ja.html independently created, not overwriting with version from Discussion.ja
To ssh://b-udm@udm.branchable.com/
70c036c..4aa7f50 master -> master
I've rebuilt it and that fixed this problem.
I see you're using the po plugin, and it seems to have some bugs that can lead to problems of this kind, especally after changes to the list of languages to translate. I see you made such a change on Oct 10th, so that's probably the root cause.
Indeed, the config change was to disable js, and that's where the conflicting file comes from!