Skip to content

Commit ab1ac28

Browse files
committed
fix merge driver
1 parent 9de3892 commit ab1ac28

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,12 @@ jobs:
8383
return 1
8484
}
8585
86-
# Build result: keep key-matched lines from local, others from remote
87-
for i in "${!LOCAL_LINES[@]}"; do
88-
if keep_line "${REMOTE_LINES[i]}"; then
89-
echo "${REMOTE_LINES[i]}"
90-
else
86+
# keep key-matched lines from local, others from remote
87+
for i in "${!REMOTE_LINES[@]}"; do
88+
if keep_line "${LOCAL_LINES[i]}"; then
9189
echo "${LOCAL_LINES[i]}"
90+
else
91+
echo "${REMOTE_LINES[i]}"
9292
fi
9393
done > "$local"
9494

0 commit comments

Comments
 (0)