From 1893eaab03dbc369bc0dfe4a5d37094d436b2810 Mon Sep 17 00:00:00 2001
From: Reyna Blacido Aparicio <122318363+BlackDoubleB@users.noreply.github.com>
Date: Fri, 6 Feb 2026 19:55:09 -0500
Subject: [PATCH 1/2] Add Windows troubleshooting for SSH agent conflicts

Add guidance for resolving passphrase prompts caused by Git for Windows using a different SSH client than the Windows ssh-agent.
---
 ...g-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/content/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md b/content/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md
index f6f91e90b3cb..20865f31cb06 100644
--- a/content/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md
+++ b/content/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md
@@ -162,6 +162,18 @@ Before adding a new SSH key to the ssh-agent to manage your keys, you should hav
    ```powershell
    ssh-add c:/Users/YOU/.ssh/id_ed25519
    ```
+> [!TIP]
+> **Troubleshooting SSH agent conflicts in Windows**
+>
+> In Windows environments, the native Windows OpenSSH implementation and the one included with Git for Windows (based on MSYS2/Bash) can coexist.
+>
+> If you configure and save your passphrases in the Windows agent using PowerShell, Git may still prompt you for your passphrase during operations like `git push`. This can happen when Git for Windows uses its bundled `ssh.exe` (from MSYS2) instead of the Windows system OpenSSH client, and therefore can't talk to the Windows `ssh-agent` service.
+>
+> To ensure Git uses the agent where you've stored your credentials, force Git to use the system's SSH binary by running:
+>
+> ```powershell
+> git config --global core.sshCommand "C:/Windows/System32/OpenSSH/ssh.exe"
+> ```
 
 {% data reusables.ssh.add-public-key-to-github %}
 

From e9a25b9d90af038ee30f75994dfe8ae3d39165e5 Mon Sep 17 00:00:00 2001
From: Reyna Blacido Aparicio <122318363+BlackDoubleB@users.noreply.github.com>
Date: Fri, 6 Feb 2026 22:23:29 -0500
Subject: [PATCH 2/2] Trigger CI

---
 ...generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/content/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md b/content/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md
index 20865f31cb06..65ad0b050ed4 100644
--- a/content/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md
+++ b/content/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md
@@ -266,5 +266,7 @@ If you are using macOS or Linux, you may need to update your SSH client or insta
    > Enter passphrase (empty for no passphrase): [Type a passphrase]
    > Enter same passphrase again: [Type passphrase again]
    ```
-
+   
 {% data reusables.ssh.add-public-key-to-github %}
+
+