Merge Desk

Paste the file git stopped on - still carrying its conflict markers - and work the stuck merge in one sitting. A real in-browser parser reads every hunk for free: which side is empty, which side is byte-identical to the diff3 merge base (so the other side is provably the answer), and which file is a lockfile that must be regenerated rather than hand-merged. Then triage every hunk with both sides' intent recovered and a recommendation per hunk, merge the hard ones with every dropped line named and justified, or review your resolution before you push - the browser computes which lines went missing, so the model has to reconcile that rather than be taken on trust. Derived from the agent skills @mattpocock/resolving-merge-conflicts and @obra/requesting-code-review. Not affiliated with those skills' authors, with Git or with GitHub, and it never runs git or touches a repository.

Every public app is built from a security-scanned skill and must pass a clean scan — skill and frontend — before it can be listed. Have a skill of your own? Turn it into an app — or read the step-by-step walkthrough.