{"id":51630573,"url":"https://github.com/zlx2019/git-pincer-desktop","last_synced_at":"2026-07-13T07:00:26.512Z","repository":{"id":370738352,"uuid":"1296637772","full_name":"zlx2019/git-pincer-desktop","owner":"zlx2019","description":"🦀 An IDEA-style three-pane GUI that grips Git conflicts — resolve merge / rebase / cherry-pick chunk by chunk.","archived":false,"fork":false,"pushed_at":"2026-07-13T05:28:11.000Z","size":2205,"stargazers_count":0,"open_issues_count":0,"forks_count":0,"subscribers_count":0,"default_branch":"main","last_synced_at":"2026-07-13T07:00:12.807Z","etag":null,"topics":["desktop","git","rust","tauri"],"latest_commit_sha":null,"homepage":"","language":"Svelte","has_issues":true,"has_wiki":null,"has_pages":null,"mirror_url":null,"source_name":null,"license":"mit","status":null,"scm":"git","pull_requests_enabled":true,"icon_url":"https://github.com/zlx2019.png","metadata":{"files":{"readme":"README.md","changelog":null,"contributing":"CONTRIBUTING.md","funding":null,"license":"LICENSE","code_of_conduct":null,"threat_model":null,"audit":null,"citation":null,"codeowners":null,"security":"SECURITY.md","support":null,"governance":null,"roadmap":null,"authors":null,"dei":null,"publiccode":null,"codemeta":null,"zenodo":null,"notice":null,"maintainers":null,"copyright":null,"agents":null,"dco":null,"cla":null}},"created_at":"2026-07-10T15:20:59.000Z","updated_at":"2026-07-13T05:28:12.000Z","dependencies_parsed_at":null,"dependency_job_id":null,"html_url":"https://github.com/zlx2019/git-pincer-desktop","commit_stats":null,"previous_names":["zlx2019/git-pincer-desktop"],"tags_count":0,"template":false,"template_full_name":null,"purl":"pkg:github/zlx2019/git-pincer-desktop","repository_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/zlx2019%2Fgit-pincer-desktop","tags_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/zlx2019%2Fgit-pincer-desktop/tags","releases_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/zlx2019%2Fgit-pincer-desktop/releases","manifests_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/zlx2019%2Fgit-pincer-desktop/manifests","owner_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners/zlx2019","download_url":"https://codeload.github.com/zlx2019/git-pincer-desktop/tar.gz/refs/heads/main","sbom_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/zlx2019%2Fgit-pincer-desktop/sbom","scorecard":null,"host":{"name":"GitHub","url":"https://github.com","kind":"github","repositories_count":286080680,"owners_count":35413540,"icon_url":"https://github.com/github.png","version":null,"created_at":"2022-05-30T11:31:42.601Z","updated_at":"2026-05-26T15:22:16.424Z","status":"online","status_checked_at":"2026-07-13T02:00:06.543Z","response_time":119,"last_error":null,"robots_txt_status":"success","robots_txt_updated_at":"2025-07-24T06:49:26.215Z","robots_txt_url":"https://github.com/robots.txt","online":true,"can_crawl_api":true,"host_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub","repositories_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories","repository_names_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repository_names","owners_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners"}},"keywords":["desktop","git","rust","tauri"],"created_at":"2026-07-13T07:00:14.029Z","updated_at":"2026-07-13T07:00:26.500Z","avatar_url":"https://github.com/zlx2019.png","language":"Svelte","funding_links":[],"categories":[],"sub_categories":[],"readme":"\u003cp align=\"center\"\u003e\n  \u003cimg src=\"assets/banner.svg\" alt=\"PINCER — IDEA-style Git conflict resolver\" /\u003e\n\u003c/p\u003e\n\n# PINCER\n\n[![CI](https://github.com/zlx2019/git-pincer-desktop/actions/workflows/ci.yml/badge.svg)](https://github.com/zlx2019/git-pincer-desktop/actions/workflows/ci.yml)\n[![Release](https://img.shields.io/github/v/release/zlx2019/git-pincer-desktop?include_prereleases)](https://github.com/zlx2019/git-pincer-desktop/releases)\n[![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)\n![Platform](https://img.shields.io/badge/platform-macOS%20%7C%20Windows%20%7C%20Linux-8a8f98)\n\n**English** | [简体中文](README.zh.md)\n\n\u003e **PINCER** takes its name from Rust's mascot — the crab. A Git conflict is two branches\n\u003e pinching the same piece of code at the same time, while a crab's pincer stands for stability,\n\u003e precision and control. May it grip both sides of every conflict firmly and carry the merge\n\u003e through.\n\nThe desktop version of [git-pincer](https://github.com/zlx2019/git-pincer) (CLI/TUI).\n\n\u003c!-- TODO(before first release): screenshots in assets/screenshots/ — compact palette + three-pane merge, ideally a main-flow GIF --\u003e\n\n## Features\n\n- **Command palette** — compact 420×640 window with the five operations on ⌘1–⌘5 and\n  terminal-style live output; usable as a desktop side widget\n- **Automatic takeover** — conflicts born in the palette *or* in an external terminal switch\n  the app to the large conflict window the moment they appear\n- **Conflicts list** — multi-select Accept Yours / Theirs, directory grouping, delete-conflict\n  handling, binary pick-one, multi-round `--continue` relay, Abort\n- **Three-pane editor** — IDEA-style chunk bands with word-level emphasis, seam ribbons with\n  apply / ignore / revert buttons, batch-apply, F7 navigation, a shared horizontal scrollbar,\n  free editing in the result pane\n- **Rust merge engine** — two line-level Myers diffs with base-range collision chunking;\n  reports one conflict too many rather than silently mis-merging\n- **Native git, zero magic** — everything shells out to your git binary, so credentials, hooks\n  and rerere follow your existing configuration; no network, no telemetry\n\nDark / light theme, Chinese / English UI, editor font and close-to-tray behavior live in\nSettings (⌘,).\n\n## Install\n\nGrab the artifact for your platform from\n[Releases](https://github.com/zlx2019/git-pincer-desktop/releases):\n\n| Platform | Artifacts |\n|---|---|\n| macOS | `.dmg` |\n| Windows | `.exe` (NSIS) / `.msi` (stable releases only) |\n| Linux | `.AppImage` / `.deb` / `.rpm` (requires `webkit2gtk`) |\n\nCurrent builds are **not code-signed**, so the first launch needs a manual bypass:\n\n- **macOS**: right-click the app → Open; if that fails run\n  `xattr -dr com.apple.quarantine /Applications/Pincer.app`\n- **Windows**: when SmartScreen blocks, click \"More info → Run anyway\"\n- **Linux**: `chmod +x` the AppImage before running\n\n## Develop\n\n```bash\npnpm install        # Node \u003e= 22, pnpm pinned via packageManager\npnpm tauri dev\n```\n\nChecks, commit conventions and the release process are documented in\n[CONTRIBUTING](CONTRIBUTING.md).\n\n## FAQ\n\n**Why only the conflict flow, and not a full git client?**\nPositioning. Log / commit / push are already served well by your shell and existing GUIs; the\none moment that still hurts is conflict resolution, so PINCER does exactly that slice.\n\n**How does it relate to IDEA's built-in merge tool?**\nIDEA's resolver is the interaction benchmark (the UI is a deliberate 1:1 restoration), but you\nget it without opening an IDE — a lightweight native window over your own git binary.\n\n**macOS says the app is damaged / from an unidentified developer.**\nExpected for unsigned builds — see [Install](#install). Right-click → Open once, or clear the\nquarantine attribute.\n\n**What does Linux need at runtime?**\n`webkit2gtk` (the Tauri webview). The `.deb` / `.rpm` declare it as a dependency; for the\nAppImage install it from your distribution's repositories.\n\n## License\n\n[MIT](LICENSE)\n","project_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Fzlx2019%2Fgit-pincer-desktop","html_url":"https://awesome.ecosyste.ms/projects/github.com%2Fzlx2019%2Fgit-pincer-desktop","lists_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Fzlx2019%2Fgit-pincer-desktop/lists"}