Indicate which script is producing output (#290)

src/scripts/merge_tools/git_hires_merge.sh

@@ -27,7 +27,7 @@ retVal=$?
 
 # report conflicts
 if [ "$retVal" -ne 0 ]; then
-    echo "Conflict"
+    echo "git_hires_merge: Conflict"
 fi
 
 exit "$retVal"

src/scripts/merge_tools/gitmerge.sh

@@ -32,7 +32,7 @@ retVal=$?
 
 # report conflicts
 if [ $retVal -ne 0 ]; then
-    echo "Conflict"
+    echo "gitmerge.sh: Conflict"
 fi
 
 exit $retVal

src/scripts/merge_tools/gitmerge_ort_adjacent.sh

@@ -13,7 +13,7 @@ fi
 
 cd "$clone_dir" || exit 1
 if ! "$MERGE_SCRIPTS_DIR"/resolve-adjacent-conflicts; then
-  echo "Conflict"
+  echo "gitmerge_ort_adjacent.sh: Conflict"
   exit 1
 fi
 

src/scripts/merge_tools/gitmerge_ort_imports.sh

@@ -22,7 +22,7 @@ retVal=$?
 
 # report conflicts
 if [ "$retVal" -ne 0 ]; then
-    echo "Conflict"
+    echo "gitmerge_ort_imports.sh: Conflict"
 fi
 
 exit "$retVal"

src/scripts/merge_tools/gitmerge_ort_imports_ignorespace.sh

@@ -7,6 +7,7 @@ branch1=$2
 branch2=$3
 strategy="-Xignore-space-change"
 
+# shellcheck disable=SC2153 # "JAVA17_HOME is not a misspelling of "JAVA_HOME"
 export JAVA_HOME="$JAVA17_HOME"
 
 cd "$clone_dir" || exit 1
@@ -23,7 +24,7 @@ retVal=$?
 
 # report conflicts
 if [ "$retVal" -ne 0 ]; then
-    echo "Conflict"
+    echo "gitmerge_ort_imports_ingorespace.sh: Conflict"
 fi
 
 exit "$retVal"

src/scripts/merge_tools/intellimerge.sh

@@ -53,6 +53,7 @@ rm -rf $temp_dir
 # report conflicts
 conflict_markers=$(grep -rE '^(<<<<<<<|=======|>>>>>>>$)' "$clone_dir" | wc -l)
 if [ "$conflict_markers" -ne "$initial_conflict_markers" ]; then
+    echo "intellimerge.sh"
     echo "Conflict markers changed"
     echo "Initial conflict markers: $initial_conflict_markers"
     echo "Final conflict markers: $conflict_markers"

src/scripts/merge_tools/spork.sh

@@ -45,7 +45,7 @@ retVal=$?
 
 # report conflicts
 if [ $retVal -ne 0 ]; then
-    echo "Conflict"
+    echo "spork.sh: Conflict"
 fi
 
 exit $retVal