| Chunk |
|---|
| Conflicting content |
|---|
import org.kohsuke.stapler.export.ExportedBean; import com.thoughtworks.xstream.XStream; <<<<<<< HEAD import hudson.ExtensionList; ======= >>>>>>> 246d351913785dc4db2bb1a2b2c9bc62ea21a640 import hudson.model.Run.RunExecution; import java.io.ByteArrayInputStream; import org.kohsuke.stapler.interceptor.RequirePOST; |
| Solution content |
|---|
import org.kohsuke.stapler.export.ExportedBean; import com.thoughtworks.xstream.XStream; import hudson.ExtensionList; import hudson.model.Run.RunExecution; import java.io.ByteArrayInputStream; import org.kohsuke.stapler.interceptor.RequirePOST; |
| File |
|---|
| Run.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import static java.util.logging.Level.*;
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
<<<<<<< HEAD
import jenkins.model.ArtifactManager;
import jenkins.model.StandardArtifactManager;
=======
import jenkins.model.RunAction2;
>>>>>>> 246d351913785dc4db2bb1a2b2c9bc62ea21a640
/**
* A particular execution of {@link Job}. |
| Solution content |
|---|
import static java.util.logging.Level.*;
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
import jenkins.model.ArtifactManager;
import jenkins.model.StandardArtifactManager;
import jenkins.model.RunAction2;
/**
* A particular execution of {@link Job}. |
| File |
|---|
| Run.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Import |