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

Class ConvergentRenameGitMergeConflict

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.ConvergentRenameGitMergeConflict

All Implemented Interfaces:

GitMergeConflict

public class ConvergentRenameGitMergeConflict
extends AbstractPathGitMergeConflict

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

Prior to Git 2.21, when different files are renamed to the same destination, git merge would not write anything to the renamed file. Instead, it would rename "our" file to one temporary file and "their" file to another temporary file.

Starting in Git 2.21, git merge's handling has changed and MergedRenameGitMergeConflict replaces this conflict type.

See Also:

DivergentRenameGitMergeConflict, MergedRenameGitMergeConflict

Constructor Summary

Constructors

Constructor and Description
ConvergentRenameGitMergeConflict(String message, String path, String ourSrcPath, String ourTmpPath, String theirSrcPath, String theirTmpPath)

Method Summary

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

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

ConvergentRenameGitMergeConflict

public ConvergentRenameGitMergeConflict(@Nonnull
                                        String message,
                                        @Nonnull
                                        String path,
                                        @Nonnull
                                        String ourSrcPath,
                                        @Nonnull
                                        String ourTmpPath,
                                        @Nonnull
                                        String theirSrcPath,
                                        @Nonnull
                                        String theirTmpPath)

Method Detail

accept

public void accept(@Nonnull
                   GitMergeConflictVisitor visitor)

getOurSrcPath

@Nonnull
public String getOurSrcPath()

getOurTmpPath

@Nonnull
public String getOurTmpPath()

getTheirSrcPath

@Nonnull
public String getTheirSrcPath()

getTheirTmpPath

@Nonnull
public String getTheirTmpPath()