resolve-merge-conflict
Skill2.1k starsChanged 2 months agoLicence not identifiedView on GitHub
WORKFLOW SKILL — Resolve a merge conflict (or a batch of them) when merging upstream OpenSSH into this Windows fork, applying the fork's Windows-compat conventions, and summarize the resolutions for the pull request. USE FOR: deciding how to resolve a specific conflicted file, choosing between take-upstream / #ifdef WINDOWS / #ifndef WINDOWS, catching upstream changes that merged cleanly but still need Windows follow-up, syncing version.h / version.rc, and writing the per-file "what/why/how" resolution notes that go into the PR description. DO NOT USE FOR: the overall multi-batch merge orchestration (that's the merge-upstream agent) or vcpkg dependency bumps (use the update-vcpkg-port skill).
1 other project uses a version of this.
Trending
Steady talk.about the whole repository
Most recently taken up by
- schmug/shipofclaudiustheir own version, first seen Sep 26, 2026
Who's talking about PowerShell/openssh-portable
- Stack Overflow“Git Bash and Pageant are not using keys”Stack Overflow · Apr 10, 2017 · 159 votes
- PowerShell/Win32-OpenSSH“Agent Forwarding Windows client to Windows host not working?”GitHub · Nov 29, 2021 · 35 reactions
- microsoft/Windows-Dev-Performance“MSYS/Cygwin performance is extremely low”GitHub · Jul 29, 2020 · 31 reactions
- Stack Overflow“openssh windows bad owner or permissions”Stack Overflow · Feb 4, 2020 · 20 votes
- Stack Overflow“Where does Windows OpenSSH ssh-agent service secretly store private keys”Stack Overflow · Jan 8, 2021 · 15 votes
The biggest 5 of 36 mentions linking to the repository that our crawl found. Each line is their own headline.
See all 36
Talked about on GitHub, Stack Overflow and Hacker News (36 times).
On GitHub · 27
- Nov 29, 2021Agent Forwarding Windows client to Windows host not working? — PowerShell/Win32-OpenSSH35 reactions · 14 comments
- Jul 29, 2020MSYS/Cygwin performance is extremely low — microsoft/Windows-Dev-Performance31 reactions · 33 comments
- Apr 15, 2025Faking pixel dimensions in the `TIOCGWINSZ` struct causes scaling issues for Sixel apps — PowerShell/Win32-OpenSSH6 reactions
- Oct 8, 2024v9.4.0.0p1 and later enforce permissions on the `logs` folder, leading to undiagnosable crashes of the service after Windows Update — PowerShell/Win32-OpenSSH6 reactions · 16 comments
- Feb 8, 2023MOTW implementation breaks deployment of binaries — PowerShell/Win32-OpenSSH4 reactions · 8 comments
22 more on GitHub
- Apr 12, 2020Working build on Windows (SSH/custom repo) — hbons/SparkleShare4 reactions · 3 comments
- Feb 25, 2023On remote login via ssh, sshd sets an environment variable that causes git operations over ssh to fail — PowerShell/Win32-OpenSSH3 reactions · 9 comments
- Nov 20, 2024Windows native OpenSSH fix — libfuse/sshfs1 reaction
- Oct 16, 2023fix: 更新 openssh 版本 — jumpserver/docker-web1 reaction
- Oct 20, 2026Update README for 10.4 release and newest-first release history — tgauth/Win32-OpenSSH0 reactions
- Aug 4, 2026fix(host): suppress Windows SSH session consoles — bmiddha/devtunnel-ssh0 reactions · 1 comment
- Oct 30, 2025Adds support to OpenSSH Servers on Windows. — openpubkey/opkssh0 reactions · 22 comments
- Oct 27, 2025Bump OpenSSH version to 10.0.0.0p2-Preview — jenkinsci/docker-ssh-agent0 reactions · 3 comments
- Oct 27, 2025remote: Fall back to SCP if SFTP fails — zed-industries/zed0 reactions
- Apr 10, 2025Bump OpenSSH version to v9.8.2.0p2-Preview — jenkinsci/docker-ssh-agent0 reactions
- Mar 11, 2025GHA/windows: change openssh server, non-debug-enabled MSVC job, other improvements — curl/curl0 reactions
- Nov 20, 2024Windows native OpenSSH fix — winfsp/sshfs-win0 reactions · 6 comments
- Aug 6, 2024Fix for Y2038 gettimeofday for Win32 builds — PowerShell/LibreSSL0 reactions · 2 comments
- Mar 29, 2024Bump OpenSSH version to v9.5.0.0p1-Beta — jenkinsci/docker-ssh-agent0 reactions · 12 comments
- Mar 27, 2024chore(Windows): add OpenSSH updatecli manifest — jenkinsci/docker-ssh-agent0 reactions
- Feb 5, 2024fix resource.h and version.rc file encoding — PowerShell/LibreSSL0 reactions
- Jun 23, 2022Add support for Win32-OpenSSH — voxpupuli/beaker0 reactions · 3 comments
- Mar 4, 2021Windows virtual environment: Use SSH binaries from the Git suite — webfactory/ssh-agent0 reactions · 2 comments
- Jan 28, 2021Add support for running authorized keys command as system — bkatyl/openssh-portable0 reactions
- Feb 10, 2020Update OpenSSH_Server_Configuration.md — MicrosoftDocs/windowsserverdocs0 reactions
- Nov 1, 2018Changes to support Windows — openssh/openssh-portable0 reactions · 2 comments
- Jan 4, 2017Fix Windows exit tunnel — aptible/aptible-cli0 reactions · 1 comment
On Stack Overflow · 7
- Apr 10, 2017Git Bash and Pageant are not using keys159 votes
- Feb 4, 2020openssh windows bad owner or permissions20 votes
- Jan 8, 2021Where does Windows OpenSSH ssh-agent service secretly store private keys15 votes
- Mar 8, 2023fetch-pack: unexpected disconnect while reading sideband packet4 votes
- Nov 28, 2024How do I create Windows custom event logs?1 vote
2 more on Stack Overflow
- Dec 28, 2024In `git remote`, what is the correct form of SSH URL to a Windows Server directory path?0 votes
- May 20, 2020Forward named pipe over ssh0 votes
On Hacker News · 2
- Sep 20, 2021Telemetry by tgauth · Pull Request #529 · PowerShell/OpenSSH-portable4 points
- Mar 28, 2023Telemetry in OpenSSH Server for Windows2 points
Other versions1 project uses a version of this.
Word for word · 0
None found.
Edited · 0
None found.
Wrote their own version · 1
- schmug/shipofclaudius★ 0same name
How matches are found. Word for word: the exact same text. Edited: shares passages with this file (“99% same” means 99% of its five-word phrases also appear here; 10% or more counts). Their own version: similar meaning, or, weakest, the same name. We can’t tell which project had it first. Projects are counted among the 200 most-starred candidates, and mentions are links to the repository we found, up to 50 per site, so both counts are a floor.
In this repository2 other files it gives its agents.
- merge-retrospectiveSkill
- update-vcpkg-portSkill
The file
We split this skill into the rules it gives an agent
3 rules. About 0 are common, 2 are distinctive, and 1 is very specific to this project.
≈0
Common · estimate
Many files like this have a rule of this kind.
≈2
Distinctive · estimate
This author's own choices. Worth a look.
1
Very specific
Tied to their project's names, files or tools. Probably skip.
The licence could not be identified — read it at the source. We count its rules but don't quote them. Read them on GitHub.
≈ “Common” is an estimate: at least 1 in 5 of the 350,495 skill files we read have a rule of the same kind, not the same words. “Very specific” is our guess from the words: it names a file, a command, a setting or the project itself.
Does it work?
Reviews from people and from AI agents that ran it: what they used it for, and whether it worked.
No reviews yet
People and AI agents can review whether this works in practice. Say what you used it for, and whether it worked.
- It worked
- Partly
- It didn't
Using an agent? It can post a review for you after it has run the file: the MCP tool registry_write, action report. How to connect one.
Your trail
Files you open will collect here, so you can find them again.
Open two or more, and you can remix the rules you like from each into one list. Kept in this browser only.
Now do this for your own.
Bring your CLAUDE.md, AGENTS.md or skills. agentleFS shows which of your rules are common, which are yours and which only fit one project, and keeps one version your agents read everywhere.