From e4f388f5b2e3397dfb5cdb5d57d904013350cfc8 Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Sat, 21 Sep 2024 12:30:07 -0700 Subject: [PATCH] Rename variable (#363) Co-authored-by: Benedikt Schesch <37979523+benedikt-schesch@users.noreply.github.com> --- src/scripts/merge_tools/intellimerge.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/scripts/merge_tools/intellimerge.sh b/src/scripts/merge_tools/intellimerge.sh index 3ddd822427..44da521634 100755 --- a/src/scripts/merge_tools/intellimerge.sh +++ b/src/scripts/merge_tools/intellimerge.sh @@ -44,13 +44,13 @@ git checkout "$branch1" --force git merge --no-edit "$branch2" # List conflicitng files -conflict_files=$(git diff --name-only --diff-filter=U) +git_conflict_files=$(git diff --name-only --diff-filter=U) # Initialize a flag to track conflict resolution conflicts_resolved=true # Iterate through conflicting files -for file in $conflict_files; do +for file in $git_conflict_files; do # Check if the conflicting file exists in the temp_out_dir if [ ! -f "$temp_out_dir$file" ]; then echo "Conflict not resolved for file: $file" @@ -62,7 +62,7 @@ done if [ "$conflicts_resolved" = false ]; then echo "Conflict detected. Aborting the merge. Please resolve the conflicts." echo "All conflicting files:" - echo "$conflict_files" + echo "$git_conflict_files" rm -rf $temp_out_dir $temp_intellimerge_dir exit 1 fi