| Chunk |
|---|
| Conflicting content |
|---|
getLog().info(logPrefix + "Finished running.");
}
<<<<<<< HEAD
private File lookupGitDirectory() {
if (dotGitDirectory != null && dotGitDirectory.exists()) {
return dotGitDirectory;
}
if (project == null) {
dotGitDirectory = new File(".git");
if (dotGitDirectory.exists() && !dotGitDirectory.isFile()) {
return dotGitDirectory;
}
}
dotGitDirectory = new File(project.getBasedir().getAbsolutePath() + "/.git");
if (dotGitDirectory.exists() && !dotGitDirectory.isFile()) {
return dotGitDirectory;
}
dotGitDirectory = new File(project.getParent().getBasedir().getAbsolutePath() + "/.git");
if (dotGitDirectory.exists() && !dotGitDirectory.isFile()) {
return dotGitDirectory;
=======
private File lookupGitDirectory()
{
if (dotGitDirectory == null || !dotGitDirectory.exists()) {
if(project == null)
{
dotGitDirectory = new File(".git");
if(dotGitDirectory.exists() && !dotGitDirectory.isFile())
{
return dotGitDirectory;
}
}
dotGitDirectory = new File(project.getBasedir().getAbsolutePath() + "/.git");
if(dotGitDirectory.exists() && !dotGitDirectory.isFile())
return dotGitDirectory;
File basedir = project.getBasedir();
dotGitDirectory = new File(basedir.getParent() + "/.git");
if(dotGitDirectory.exists() && !dotGitDirectory.isFile())
return dotGitDirectory;
}
return dotGitDirectory;
>>>>>>> a91770235589e9df460b7d30a1282de87921338d
}
return dotGitDirectory;
} |
| Solution content |
|---|
getLog().info(logPrefix + "Finished running.");
}
private File lookupGitDirectory()
{
if (dotGitDirectory == null || !dotGitDirectory.exists()) {
if(project == null)
{
dotGitDirectory = new File(".git");
if(dotGitDirectory.exists() && !dotGitDirectory.isFile())
{
return dotGitDirectory;
}
}
dotGitDirectory = new File(project.getBasedir().getAbsolutePath() + "/.git");
if(dotGitDirectory.exists() && !dotGitDirectory.isFile())
return dotGitDirectory;
File basedir = project.getBasedir();
dotGitDirectory = new File(basedir.getParent() + "/.git");
if(dotGitDirectory.exists() && !dotGitDirectory.isFile())
return dotGitDirectory;
}
return dotGitDirectory;
} |
| File |
|---|
| GitCommitIdMojo.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Attribute |
| If statement |
| Method invocation |
| Method signature |
| Return statement |