From 9133066fe510d0c89006fa231f9f96d3a3cf7375 Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Sat, 21 Sep 2024 09:36:26 -0700
Subject: [PATCH] Rename variable

---
 src/python/replay_merge.py              | 6 +++---
 src/scripts/merge_tools/intellimerge.sh | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/python/replay_merge.py b/src/python/replay_merge.py
index 321472e87e..efe2b00393 100755
--- a/src/python/replay_merge.py
+++ b/src/python/replay_merge.py
@@ -268,11 +268,11 @@ def merge_replay(
                     stderr=subprocess.PIPE,
                 )
                 if len(process.stderr.decode("utf-8")) == 0:
-                    conflict_files = process.stdout.decode("utf-8")
-                    is_conflict = len(conflict_files) > 0
+                    git_conflict_files = process.stdout.decode("utf-8")
+                    is_conflict = len(git_conflict_files) > 0
                     assert (
                         is_conflict == (merge_result == MERGE_STATE.Merge_failed)
-                    ), f"merge_replay: tool{merge_tool} merge_result {merge_result} does not match conflict_files {conflict_files} at path {repo.local_repo_path}"
+                    ), f"merge_replay: tool{merge_tool} merge_result {merge_result} does not match git_conflict_files {git_conflict_files} at path {repo.local_repo_path}"
 
             result_df.loc[
                 merge_tool.name,
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