From 0425c3a4fc3d731f5c6a7b24d1bfb11998c017e3 Mon Sep 17 00:00:00 2001
From: Vatsal Gupta <40350810+gvatsal60@users.noreply.github.com>
Date: Thu, 18 Sep 2025 13:25:01 +0000
Subject: [PATCH 1/2] Resolved Merge Conflicts

---
 .pre-commit-config.yaml | 73 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 .pre-commit-config.yaml

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 000000000..ce00a333a
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,73 @@
+default_stages: [pre-push]
+files: '.*'
+fail_fast: true
+repos:
+  # Syncs pre-commit dependencies with the latest versions.
+  - repo: https://github.com/mxr/sync-pre-commit-deps
+    rev: "v0.0.1"
+    hooks:
+      - id: sync-pre-commit-deps
+  # Pre-commit hooks for general file checks
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: "v5.0.0"
+    hooks:
+      - id: check-added-large-files
+      - id: check-case-conflict
+      # - id: check-executables-have-shebangs
+      # - id: check-json
+      # - id: check-shebang-scripts-are-executable
+      # - id: check-symlinks
+      # - id: check-vcs-permalinks
+      # - id: check-yaml
+      # - id: destroyed-symlinks
+      # - id: detect-private-key
+      # - id: double-quote-string-fixer
+      # - id: end-of-file-fixer
+      # - id: fix-byte-order-marker
+      # - id: mixed-line-ending
+      # - id: pretty-format-json
+      #   args: [--autofix, --no-sort-keys]
+      # - id: trailing-whitespace
+  # ShellCheck hook for linting shell scripts
+  # - repo: https://github.com/shellcheck-py/shellcheck-py
+  #   rev: "v0.10.0.1"
+  #   hooks:
+  #     - id: shellcheck
+  #       name: shellcheck
+  #       description: This hook runs shellcheck for linting shell scripts
+  # Bashate hook for linting shell scripts
+  # - repo: https://github.com/openstack/bashate
+  #   rev: "2.1.1"
+  #   hooks:
+  #     - id: bashate
+  #       name: bashate
+  #       description: This hook runs bashate for linting shell scripts
+  #       entry: bashate
+  #       language: python
+  #       types: [shell]
+  # Actionlint for linting GitHub Actions YAML files
+  # - repo: https://github.com/rhysd/actionlint
+  #   rev: "v1.7.3"
+  #   hooks:
+  #     - id: actionlint
+  # Yamlfmt for formatting YAML files
+  # - repo: https://github.com/google/yamlfmt
+  #   rev: "v0.13.0"
+  #   hooks:
+  #     - id: yamlfmt
+  # Codespell for detecting common misspellings in code
+  # - repo: https://github.com/codespell-project/codespell
+  #   rev: "v2.3.0"
+  #   hooks:
+  #     - id: codespell
+  # Gitleaks for detecting secrets in Git repositories
+  # - repo: https://github.com/gitleaks/gitleaks
+  #   rev: "v8.19.3"
+  #   hooks:
+  #     - id: gitleaks
+  # Talisman for pre-commit Git hooks to detect sensitive files
+  # - repo: https://github.com/thoughtworks/talisman
+  #   rev: "v1.32.0"
+  #   hooks:
+  #     - id: talisman-commit
+  #       entry: cmd --githook pre-commit

From 963b43a62d54691cd0b021b9160b017ba2bd46c5 Mon Sep 17 00:00:00 2001
From: Vatsal Gupta <40350810+gvatsal60@users.noreply.github.com>
Date: Thu, 18 Sep 2025 13:27:28 +0000
Subject: [PATCH 2/2] Removed default options

---
 .pre-commit-config.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index ce00a333a..935c2f8b0 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,6 +1,3 @@
-default_stages: [pre-push]
-files: '.*'
-fail_fast: true
 repos:
   # Syncs pre-commit dependencies with the latest versions.
   - repo: https://github.com/mxr/sync-pre-commit-deps