[Maltcmsui-commit] Build failed in Jenkins: Maui #82
Maui is the Maltcms User Interface
Status: Beta
Brought to you by:
nilshoffmann
|
From: Jenkins <je...@ma...> - 2013-06-28 13:20:17
|
See <https://maltcms.de/jenkins/job/Maui/82/> ------------------------------------------ Started by an SCM change Building in workspace <https://maltcms.de/jenkins/job/Maui/ws/> Checkout:Maui / <https://maltcms.de/jenkins/job/Maui/ws/> - hudson.remoting.LocalChannel@2c7fd57c Using strategy: Default Last Built Revision: Revision 8c9452964eb085cd3d1354600fbaec6213644fc4 (origin/master, origin/HEAD) Wiping out workspace first. Cloning the remote Git repository Cloning repository git://git.code.sf.net/p/maltcmsui/code git --version git version 1.7.9.5 Fetching upstream changes from origin Cleaning workspace Resetting working tree Seen branch in repository origin/HEAD Seen branch in repository origin/master Seen branch in repository origin/nils-custom Seen branch in repository origin/normalizationFeature-phjlk Seen 4 remote branches Commencing build of Revision c3f608a48a4766af475eed3a8d122644452f0123 (origin/normalizationFeature-phjlk) Merging Revision c3f608a48a4766af475eed3a8d122644452f0123 (origin/normalizationFeature-phjlk) onto master ERROR: Branch not suitable for integration as it does not merge cleanly Archiving artifacts |