Cleaner

A macOS app that removes Git merge-conflict markers from pasted text. Choose a simple rule-based strategy, or let on-device Apple Intelligence pick a smart resolution.

Features

• Paste conflicted text and clean it instantly
• Resolution strategies:
  • HEAD — keep the first side of each conflict
  • Incoming — keep the second side
  • Remove — drop both sides (markers and conflicted lines)
  • Smart — use Apple’s on-device Foundation Model to resolve conflicts
• Copy cleaned result to the clipboard

Requirements

• macOS 26 or later
• Xcode 26+ (to build from source)
• Smart mode requires Apple Intelligence enabled on a supported Mac

Download

Grab the latest build from Releases.

Gatekeeper note: if macOS blocks the app, Right-click the app → Open, then confirm.

Download counts appear on each release asset on the Releases page.

Build from source

1. Open Cleaner.xcodeproj in Xcode
2. Select the Cleaner scheme
3. Product → Run (or Archive for a release build)

Usage

1. Paste text that contains Git conflict markers (<<<<<<<, =======, >>>>>>>)
2. Pick a resolution strategy
3. Click Clean Merge Conflicts
4. Copy the cleaned output

How Smart mode works

Smart mode uses Apple’s Foundation Models (SystemLanguageModel) on device. Your pasted text stays on your Mac — no cloud API key and no network call for cleaning.

If Apple Intelligence isn’t available, use HEAD / Incoming / Remove instead.

Privacy

• Conflict text is processed locally in the app
• Smart resolution runs on-device via Apple Intelligence
• No analytics or accounts required for the core cleaner