Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
* Three-way merges are no performed. See {@link #setFailOnConflict(boolean)}.
*/
public class WorkDirCheckout {
- Repository repo;
-
File root;
GitIndex index;
WorkDirCheckout(Repository repo, File workDir,
GitIndex oldIndex, GitIndex newIndex) throws IOException {
- this.repo = repo;
this.root = workDir;
this.index = oldIndex;
this.merge = repo.mapTree(newIndex.writeTree());
*/
public WorkDirCheckout(Repository repo, File root,
GitIndex index, Tree merge) {
- this.repo = repo;
this.root = root;
this.index = index;
this.merge = merge;