Skip to content

Y
ygopro-database
Commit fdd657d8 authored by nanahira's avatar nanahira
Browse files
Options

fix

parent 56e7be88
Pipeline #36061 passed with stage
    in 36 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 1 addition and 1 deletion
    scripts/sqlite-merge.sh
    View file @ fdd657d8
    ...@@ -47,7 +47,7 @@ if grep '^<<<<<<<' "$TMPDIR/merged.sql" >/dev/null; then ...@@ -47,7 +47,7 @@ if grep '^<<<<<<<' "$TMPDIR/merged.sql" >/dev/null; then
    exit 1 # 保留冲突文件，人工处理，故不 cleanup exit 1 # 保留冲突文件，人工处理，故不 cleanup
    fi fi
    echo '' > "$RESULT" rm -f "$RESULT"
    "$SQLITE3" "$RESULT" < "$TMPDIR/merged.sql" || { "$SQLITE3" "$RESULT" < "$TMPDIR/merged.sql" || {
    echo "❌ Failed to import merged SQL" echo "❌ Failed to import merged SQL"
    echo " --> $CONFLICT_FILE" echo " --> $CONFLICT_FILE"
    ......
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment