com.atlassian.bitbucket.scm.git.command.merge.conflict

Class MergedRenameGitMergeConflict

java.lang.Object

com.atlassian.bitbucket.scm.git.command.merge.conflict.AbstractGitMergeConflict

com.atlassian.bitbucket.scm.git.command.merge.conflict.AbstractPathGitMergeConflict

com.atlassian.bitbucket.scm.git.command.merge.conflict.MergedRenameGitMergeConflict

All Implemented Interfaces:

GitMergeConflict

public class MergedRenameGitMergeConflict
extends AbstractPathGitMergeConflict

Describes a conflict where two different files are renamed to the same destination.

Starting in Git 2.21, when two different files are renamed to the same destination, git merge merges their contents in-place and stores the result in the renamed file.

Prior to Git 2.21, git merge stored the two original files in separate temporary files without trying to merge them, and ConvergentRenameGitMergeConflict is used instead of this conflict type.

Since:

6.2

See Also:

ConvergentRenameGitMergeConflict, DivergentRenameGitMergeConflict

Constructor Summary

Constructors

Constructor and Description
MergedRenameGitMergeConflict(String message, String path, String ourSrcPath, String theirSrcPath)

Method Summary

Modifier and Type	Method and Description
void	accept(GitMergeConflictVisitor visitor)
String	getOurSrcPath()
String	getTheirSrcPath()

Methods inherited from class com.atlassian.bitbucket.scm.git.command.merge.conflict.AbstractPathGitMergeConflict

getPath

Methods inherited from class com.atlassian.bitbucket.scm.git.command.merge.conflict.AbstractGitMergeConflict

getMessage, getOurChange, getTheirChange, getType

Methods inherited from class java.lang.Object

clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Constructor Detail

MergedRenameGitMergeConflict

public MergedRenameGitMergeConflict(@Nonnull
                                    String message,
                                    @Nonnull
                                    String path,
                                    @Nonnull
                                    String ourSrcPath,
                                    @Nonnull
                                    String theirSrcPath)

Method Detail

accept

public void accept(@Nonnull
                   GitMergeConflictVisitor visitor)

getOurSrcPath

@Nonnull
public String getOurSrcPath()

getTheirSrcPath

@Nonnull
public String getTheirSrcPath()