diff --git a/src/main/java/de/oppermann/pomutils/PomMergeDriver.java b/src/main/java/de/oppermann/pomutils/PomMergeDriver.java index 7c43cb2..c77292f 100644 --- a/src/main/java/de/oppermann/pomutils/PomMergeDriver.java +++ b/src/main/java/de/oppermann/pomutils/PomMergeDriver.java @@ -55,6 +55,9 @@ public PomMergeDriver(Ruleset ruleset, String basePomFile, String ourPomFile, St public int merge() { try { + logger.debug("Doing merge [our={}] [base={}] [their={}]", ourPomFile, + basePomFile, theirPomFile); + POM basePom = new POM(basePomFile); POM ourPom = new POM(ourPomFile); POM theirPom = new POM(theirPomFile); @@ -74,7 +77,8 @@ public int merge() { } private int doGitMerge() { - ProcessBuilder processBuilder = new ProcessBuilder("git", "merge-file", "-L", "ours", "-L", "base", "-L", "theirs", + ProcessBuilder processBuilder = new ProcessBuilder("git", "merge-file", "-L", "ours", "-L", "base", "-L", + "theirs", ourPomFile, basePomFile, theirPomFile); processBuilder.redirectErrorStream(true); try {