org.commonjava.aprox.subsys.git.ConflictStrategy Maven / Gradle / Ivy

Go to download

Show more of this group Show more artifacts with this name
Show all versions of aprox-subsys-git Show documentation

The newest version!

/**
 * Copyright (C) 2011 Red Hat, Inc. ([email protected])
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *         http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package org.commonjava.aprox.subsys.git;

import org.eclipse.jgit.merge.MergeStrategy;

public enum ConflictStrategy
{

    keep( MergeStrategy.OURS ), overwrite( MergeStrategy.THEIRS ), merge( MergeStrategy.RECURSIVE );

    private MergeStrategy mergeStrategy;

    ConflictStrategy( final MergeStrategy mergeStrategy )
    {
        this.mergeStrategy = mergeStrategy;
    }

    public MergeStrategy mergeStrategy()
    {
        return mergeStrategy;
    }

}