Skip to content

Commit d96cc16

Browse files
committed
some debug logging
1 parent 7c9e30b commit d96cc16

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

src/main/java/de/oppermann/pomutils/PomMergeDriver.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ public PomMergeDriver(Ruleset ruleset, String basePomFile, String ourPomFile, St
5555

5656
public int merge() {
5757
try {
58+
logger.debug("Doing merge [our={}] [base={}] [their={}]", ourPomFile,
59+
basePomFile, theirPomFile);
60+
5861
POM basePom = new POM(basePomFile);
5962
POM ourPom = new POM(ourPomFile);
6063
POM theirPom = new POM(theirPomFile);
@@ -74,7 +77,8 @@ public int merge() {
7477
}
7578

7679
private int doGitMerge() {
77-
ProcessBuilder processBuilder = new ProcessBuilder("git", "merge-file", "-L", "ours", "-L", "base", "-L", "theirs",
80+
ProcessBuilder processBuilder = new ProcessBuilder("git", "merge-file", "-L", "ours", "-L", "base", "-L",
81+
"theirs",
7882
ourPomFile, basePomFile, theirPomFile);
7983
processBuilder.redirectErrorStream(true);
8084
try {

0 commit comments

Comments
 (0)