Projects >> rebuild-plugin >>2eed1393add2a538fde519f69426050f1b4ef809

Chunk
Conflicting content 
 */
package com.sonyericsson.rebuild;

<<<<<<< HEAD
import hudson.Extension;
import hudson.matrix.MatrixRun;
import hudson.model.*;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import org.kohsuke.stapler.Stapler;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerResponse;

import javax.servlet.ServletException;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
=======
import java.util.ArrayList;
import java.io.IOException;
import java.util.List;
import javax.servlet.ServletException;

import hudson.model.*;
import org.kohsuke.stapler.*;
import net.sf.json.*;

import hudson.matrix.MatrixRun;
>>>>>>> 3e877758432e0cf7feb844a0a479c04a1fdceb7a

/**
 * Rebuild RootAction implementation class. This class will basically reschedule
Solution content 
 */
package com.sonyericsson.rebuild;

import hudson.Extension;
import hudson.matrix.MatrixRun;
import hudson.model.*;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import hudson.model.*;
import org.kohsuke.stapler.*;
import net.sf.json.*;

import javax.servlet.ServletException;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import hudson.matrix.MatrixRun;

/**
 * Rebuild RootAction implementation class. This class will basically reschedule
File
RebuildAction.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
    public void nonParameterizedRebuild(AbstractBuild currentBuild, StaplerResponse
            response) throws ServletException, IOException, InterruptedException {
        getProject().checkPermission(AbstractProject.BUILD);
<<<<<<< HEAD
        List actions = copyBuildCausesAndAddUserCause(currentBuild);
        Hudson.getInstance().getQueue().schedule(currentBuild.getProject(), 0, actions);
=======

		CauseAction cause = new CauseAction(new RebuildCause(currentBuild));
		Hudson.getInstance().getQueue().schedule(currentBuild.getProject(), 0, null, cause);
>>>>>>> 3e877758432e0cf7feb844a0a479c04a1fdceb7a
        response.sendRedirect("../../");
    }
Solution content 
    public void nonParameterizedRebuild(AbstractBuild currentBuild, StaplerResponse
            response) throws ServletException, IOException, InterruptedException {
        getProject().checkPermission(AbstractProject.BUILD);

        CauseAction cause = new CauseAction(new RebuildCause(currentBuild));
        Hudson.getInstance().getQueue().schedule(currentBuild.getProject(), 0, null, cause);
        response.sendRedirect("../../");
    }
File
RebuildAction.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
                }
            }

<<<<<<< HEAD
            List actions = copyBuildCausesAndAddUserCause(build);
            actions.add(new ParametersAction(values));

            Hudson.getInstance().getQueue().schedule(build.getProject(), 0, actions);
=======
			CauseAction cause = new CauseAction(new RebuildCause(build));
			Hudson.getInstance().getQueue().schedule(build.getProject(), 0, new ParametersAction(values), cause);
>>>>>>> 3e877758432e0cf7feb844a0a479c04a1fdceb7a
            rsp.sendRedirect("../../");
        }
    }
Solution content 
                }
            }

            CauseAction cause = new CauseAction(new RebuildCause(build));
            Hudson.getInstance().getQueue().schedule(build.getProject(), 0, new ParametersAction(values), cause);

            rsp.sendRedirect("../../");
        }
    }
File
RebuildAction.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable