Resolve merge conflicts - keep version without Prettier calls

Author: vikahaze

scripts/normalize_book_sets.py

@@ -299,6 +299,7 @@ def normalize_book_sets(
             print("[DRY RUN] Would write changes to file (use --write to apply)")
         else:
             try:
+                # Write JSON file (prettier will format it via pre-commit hook)
                 with open(book_sets_file, "w", encoding="utf-8") as f:
                     json.dump(data, f, ensure_ascii=False)
 

scripts/normalize_json.py

@@ -3,6 +3,7 @@
 """
 Reads a JSON file, sorts its top-level keys numerically,
 and writes the sorted data to a new JSON file.
+Prettier will format the output according to .prettierrc config.
 
 python scripts/normalize_json.py data/leetcode-problems.json
 """
@@ -14,7 +15,7 @@
 
 def sort_json_by_numeric_keys(input_file, output_file):
     """
-    Sort JSON file by numeric keys
+    Sort JSON file by numeric keys and format according to Prettier style.
 
     Args:
         input_file (str): The path to the input JSON file.
@@ -31,6 +32,7 @@ def sort_json_by_numeric_keys(input_file, output_file):
         sorted_items = sorted(data.items(), key=lambda item: int(item[0]))
         sorted_data = OrderedDict(sorted_items)
 
+        # Write JSON (Prettier will format it via pre-commit hook)
         with open(output_file, "w", encoding="utf-8") as f:
             json.dump(sorted_data, f, ensure_ascii=False)
 

scripts/sort_book_sets_by_difficulty.py

@@ -14,6 +14,7 @@
 """
 
 import json
+import os
 import sys
 import argparse
 from pathlib import Path
@@ -182,6 +183,7 @@ def main():
         print(f"Dry run complete. Would update {updated_count} set(s).")
     else:
         if updated_count > 0:
+            # Save updated book-sets.json (Prettier will format it via pre-commit hook)
             with open(BOOK_SETS_PATH, "w", encoding="utf-8") as f:
                 json.dump(book_sets, f, ensure_ascii=False)
             print(f"✓ Updated {updated_count} book set(s) in {BOOK_SETS_PATH}")

scripts/update_problems_from_csv.py

@@ -156,6 +156,7 @@ def save_json(data):
         )
         sorted_data = OrderedDict(sorted_items)
 
+        # Write JSON (Prettier will format it via pre-commit hook)
         with open(JSON_PATH, "w", encoding="utf-8") as f:
             json.dump(sorted_data, f, ensure_ascii=False)
         return True