From bb7c88169a2ae1c83e443e66fae2d6990499d9ec Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 1 Feb 2026 15:03:26 +0000
Subject: [PATCH 1/3] Initial plan


From 2004957342befdef7d0473575196ab5812bf4d89 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 1 Feb 2026 15:05:45 +0000
Subject: [PATCH 2/3] Document 9 commits to preserve during merge

Co-authored-by: vkuttyp <146238+vkuttyp@users.noreply.github.com>
---
 COMMITS.md  | 44 ++++++++++++++++++++++++++++++++++++++++++++
 PR_NOTES.md | 26 ++++++++++++++++++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 COMMITS.md
 create mode 100644 PR_NOTES.md

diff --git a/COMMITS.md b/COMMITS.md
new file mode 100644
index 0000000..74ceba1
--- /dev/null
+++ b/COMMITS.md
@@ -0,0 +1,44 @@
+# Commit History Documentation
+
+## Important: Preserve These 9 Commits
+
+This document lists 9 commits that should be preserved in the git history. When merging this branch, please use **merge commit** strategy instead of squash to maintain the detailed commit history.
+
+### The 9 Commits to Preserve
+
+1. **1708ed6** - Update autofix.yml
+   - Initial update to the autofix workflow
+
+2. **3f102c4** - Refactor GitHub Actions workflow for testing and coverage
+   - Added codecov integration
+   - Improved workflow structure
+
+3. **e0c8db6** - Refactor GitHub Actions workflow for autofix
+   - Enhanced autofix workflow configuration
+
+4. **7e14dba** - Initial plan
+   - Planning commit for workflow changes
+
+5. **8844396** - Fix typo in autofix workflow: use -g --force instead of -fg
+   - Bug fix for autofix workflow flags
+
+6. **a8a443c** - Merge pull request #1 from vkuttyp/copilot/change-repo-settings
+   - Merged changes for repository settings
+
+7. **f7a4a53** - Initial plan
+   - Planning commit for PR #1
+
+8. **ebcf2f7** - Merge upstream main changes into add-mssql-support branch
+   - Synchronized with upstream changes
+
+9. **577a3d1** - Merge pull request #3 from vkuttyp/copilot/resolve-pull-request-conflicts
+   - Merged conflict resolution changes
+
+## Merge Instructions
+
+When merging this PR:
+- ✅ Use **"Create a merge commit"** option
+- ❌ Do NOT use "Squash and merge"
+- ❌ Do NOT use "Rebase and merge" (unless you want to preserve individual commits)
+
+This ensures that all 9 commits remain visible in the project's git history for future reference and debugging.
diff --git a/PR_NOTES.md b/PR_NOTES.md
new file mode 100644
index 0000000..cb41c9c
--- /dev/null
+++ b/PR_NOTES.md
@@ -0,0 +1,26 @@
+# Pull Request Notes
+
+## Merge Strategy: Preserve Commit History
+
+⚠️ **IMPORTANT**: This PR contains 9 individual commits that should be preserved in the git history.
+
+### Why Keep These Commits?
+
+Each commit represents a distinct change or milestone:
+- Workflow configuration updates
+- Bug fixes
+- Planning and merge commits from previous PRs
+- Integration of upstream changes
+
+### Required Merge Method
+
+Please use **"Create a merge commit"** when merging this PR to maintain the full commit history. Do not use "Squash and merge" as this would collapse all 9 commits into a single commit, losing the granular history.
+
+### Verification
+
+After merging, verify that all 9 commits are visible in the main branch history:
+```bash
+git log --oneline main~9..main
+```
+
+See [COMMITS.md](./COMMITS.md) for the complete list of commits to preserve.

From 9b921bff3fa7cedad0ae49d1c86a88561c2dd129 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 1 Feb 2026 15:06:58 +0000
Subject: [PATCH 3/3] Fix merge instructions to clarify rebase and merge option

Co-authored-by: vkuttyp <146238+vkuttyp@users.noreply.github.com>
---
 COMMITS.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/COMMITS.md b/COMMITS.md
index 74ceba1..9f040dd 100644
--- a/COMMITS.md
+++ b/COMMITS.md
@@ -37,8 +37,8 @@ This document lists 9 commits that should be preserved in the git history. When
 ## Merge Instructions
 
 When merging this PR:
-- ✅ Use **"Create a merge commit"** option
-- ❌ Do NOT use "Squash and merge"
-- ❌ Do NOT use "Rebase and merge" (unless you want to preserve individual commits)
+- ✅ Use **"Create a merge commit"** option (recommended)
+- ✅ Or use **"Rebase and merge"** (also preserves individual commits)
+- ❌ Do NOT use "Squash and merge" (will collapse all commits into one)
 
 This ensures that all 9 commits remain visible in the project's git history for future reference and debugging.