ConflictResolver

An Xcode Source Editor Extension that helps resolving merge conflicts. There are three options, namely 'Accept theirs', 'Accept Yours', and 'Keep Both'. Only one click and it will make the change for you automatically.

Generate Convert Improve

Install / Use

/learn @liaojinxing/ConflictResolver

About this skill

Quality Score

0/100

README

Conflict Resolver

Description

An Xcode Source Editor Extension that helps resolving merge conflicts.
Available via Editor -> Resolve Conflict

Features

[x] There are three options, namely 'Accept theirs', 'Accept Yours', and 'Keep Both'. Only one click and it will make the change for you automatically.
[x] Jump to next conflict.
[x] Git diff3 style supported.

How to install

Download the latest binary from https://github.com/liaojinxing/ConflictResolver/tree/master/Releases
Drag MergePlugin.app to your Applications folder
Double click MergePlugin.app and exit.
Go to System Preferences -> Extensions -> Xcode Source Editor and enable the extension
The menu-item should now be available from Xcode's Editor menu.

Licence

This project is released under the MIT license. See LICENSE.md.

Related Skills

node-connect

354.0k

Diagnose OpenClaw node connection and pairing failures for Android, iOS, and macOS companion apps

frontend-design

112.2k

Create distinctive, production-grade frontend interfaces with high design quality. Use this skill when the user asks to build web components, pages, or applications. Generates creative, polished code that avoids generic AI aesthetics.

openai-whisper-api

354.0k

Transcribe audio via OpenAI Audio Transcriptions API (Whisper).

qqbot-media

354.0k

QQBot 富媒体收发能力。使用 <qqmedia> 标签，系统根据文件扩展名自动识别类型（图片/语音/视频/文件）。