org.apache.commons.jelly.JellyTagException: jar:file:/var/jenkins_home/war/WEB-INF/lib/jenkins-core-2.60.3.jar!/jenkins/model/Jenkins/configure.jelly:59:84: <st:include> org.kohsuke.stapler.ScriptLoadException: org.apache.commons.jelly.JellyException: Could not parse Jelly script : jar:file:/var/jenkins_home/plugins/configuration-as-code/WEB-INF/lib/configuration-as-code.jar!/org/jenkinsci/plugins/casc/ConfigurationAsCode/index.jelly at org.apache.commons.jelly.impl.TagScript.handleException(TagScript.java:726) at org.apache.commons.jelly.impl.TagScript.run(TagScript.java:281) at org.kohsuke.stapler.jelly.CallTagLibScript$1.run(CallTagLibScript.java:99) at org.apache.commons.jelly.tags.define.InvokeBodyTag.doTag(InvokeBodyTag.java:91)
(...)So I attached to docker container and checked /var/jenkins_home/plugins/configuration-as-code/WEB-INF/lib/configuration-as-code.jar!/org/jenkinsci/plugins/casc/ConfigurationAsCode/index.jelly, and in it I can see:
<<<<<<< HEAD
<h4 id="${c.extensionpoint.simpleName}-${c.name}">${c.name}</h4>
<j:if test="${c.extensionpoint != c.target}">
Implementation of ${c.extensionpoint.simpleName}
=======
<h4 id="${c.extensionPoint.simpleName}-${c.name}">${c.name}</h4>
<j:if test="${c.extensionPoint != c.target}">
Implementation of <a href="https://jenkins.io/doc/developer/extensions/${c.extensionSource}/#${c.extensionPoint.simpleName.toLowerCase()}">${c.extensionPoint.simpleName}</a>
>>>>>>> fork/master
--
You received this message because you are subscribed to the Google Groups "Jenkins Developers" group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-de...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-dev/3cb870c9-4e69-413d-a4d2-29e106459725%40googlegroups.com.
For more options, visit https://groups.google.com/d/optout.