Jenkins builds sometime fail with "Your local changes to the following files would be overwritten by merge"
Originally created by @intrigeri on #9406 (Redmine)
E.g.:
+ git merge --no-edit origin/devel
error: Your local changes to the following files would be overwritten by merge:
wiki/src/doc/about/features.de.po
wiki/src/doc/about/features.fr.po
wiki/src/doc/about/features.pt.po
wiki/src/doc/advanced_topics.index.de.po
wiki/src/doc/advanced_topics.index.fr.po
wiki/src/doc/advanced_topics.index.pt.po
wiki/src/doc/anonymous_internet/Tor_Browser.de.po
wiki/src/doc/anonymous_internet/Tor_Browser.fr.po
wiki/src/doc/anonymous_internet/Tor_Browser.pt.po
wiki/src/doc/first_steps/installation.de.po
wiki/src/news/version_1.4.de.po
wiki/src/news/version_1.4.fr.po
wiki/src/news/version_1.4.pt.po
wiki/src/support/faq.de.po
wiki/src/support/faq.fr.po
wiki/src/support/faq.pt.po
wiki/src/support/known_issues.de.po
wiki/src/support/known_issues.fr.po
wiki/src/support/known_issues.pt.po
Please, commit your changes or stash them before you can merge.
error: The following untracked working tree files would be overwritten by merge:
wiki/src/doc/advanced_topics/paperkey.de.po
wiki/src/doc/advanced_topics/paperkey.fr.po
wiki/src/doc/advanced_topics/paperkey.pt.po
Please move or remove them before you can merge.
I suspect that running git clean -fdx
before merging would be enough
to fix that.
Feature Branch: bugfix/9406-jenkins-build-in-clean-git