Projects >> hudson >>657a05b0f518450f792ac7ab88c7611c36a7ef61

Chunk
Conflicting content 
        buildMixIn.onLoad(parent, name);
        builds = buildMixIn.getRunMap();
        triggers().setOwner(this);
<<<<<<< HEAD
        if (isBuildable()) {
            for (Trigger t : triggers()) {
                try {
                    t.start(this, Items.currentlyUpdatingByXml());
                } catch (Throwable e) {
                    LOGGER.log(Level.WARNING, "could not start trigger while loading project '" + getFullName() + "'", e);
                }
=======
        for (Trigger t : triggers()) {
            try {
                t.start(this, Items.currentlyUpdatingByXml());
            } catch (Throwable e) {
                LOGGER.log(Level.WARNING, "could not start trigger while loading project '" + getFullName() + "'", e);
>>>>>>> 6b0120f41f0bde2b98b88b7a20bee40d08b51575
            }
        }
        if(scm==null)
Solution content 
        buildMixIn.onLoad(parent, name);
        builds = buildMixIn.getRunMap();
        triggers().setOwner(this);
        if (isBuildable()) {
            for (Trigger t : triggers()) {
                try {
                    t.start(this, Items.currentlyUpdatingByXml());
                } catch (Throwable e) {
                    LOGGER.log(Level.WARNING, "could not start trigger while loading project '" + getFullName() + "'", e);
                }
            }
        }
        if(scm==null)
File
AbstractProject.java
Developer's decision
Version 1
Kind of conflict
Catch clause
For statement
If statement
Method invocation
Try statement
Chunk
Conflicting content 
import org.junit.runner.Description;
import org.junit.runners.model.FrameworkMethod;
import org.junit.runners.model.Statement;
<<<<<<< HEAD
import com.gargoylesoftware.htmlunit.html.DomNodeUtil;
import com.gargoylesoftware.htmlunit.html.HtmlFormUtil;
=======
>>>>>>> 6b0120f41f0bde2b98b88b7a20bee40d08b51575
import java.nio.channels.ClosedByInterruptException;
import org.jvnet.hudson.test.recipes.Recipe;
import org.jvnet.hudson.test.rhino.JavaScriptDebugger;
Solution content 
import org.junit.runner.Description;
import org.junit.runners.model.FrameworkMethod;
import org.junit.runners.model.Statement;
import com.gargoylesoftware.htmlunit.html.DomNodeUtil;
import com.gargoylesoftware.htmlunit.html.HtmlFormUtil;
import java.nio.channels.ClosedByInterruptException;
import org.jvnet.hudson.test.recipes.Recipe;
import org.jvnet.hudson.test.rhino.JavaScriptDebugger;
File
JenkinsRule.java
Developer's decision
Version 1
Kind of conflict
Import