diff --git a/src/scripts/merge_tools/gitmerge_ort_imports.sh b/src/scripts/merge_tools/gitmerge_ort_imports.sh index 56c6275ff8..cf0309d91f 100755 --- a/src/scripts/merge_tools/gitmerge_ort_imports.sh +++ b/src/scripts/merge_tools/gitmerge_ort_imports.sh @@ -11,7 +11,7 @@ if "$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$strateg exit 0 fi -cd "$clone_dir" +cd "$clone_dir" || exit 1 if ! "$MERGE_SCRIPTS_DIR"/resolve-import-conflicts; then exit 1 fi diff --git a/src/scripts/merge_tools/gitmerge_ort_imports_ignorespace.sh b/src/scripts/merge_tools/gitmerge_ort_imports_ignorespace.sh index a4291bb18a..b6ae36b948 100755 --- a/src/scripts/merge_tools/gitmerge_ort_imports_ignorespace.sh +++ b/src/scripts/merge_tools/gitmerge_ort_imports_ignorespace.sh @@ -11,7 +11,7 @@ if "$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$strateg exit 0 fi -cd "$clone_dir" +cd "$clone_dir" || exit 1 if ! "$MERGE_SCRIPTS_DIR"/resolve-import-conflicts; then exit 1 fi