resolve-merge-conflicts
Resolve Merge Conflicts
Use this skill when a user wants merge conflicts on an active PR resolved all the way through, not just inspected.
The goal is:
- identify the PR base branch
- merge the base into the current branch locally
- resolve the conflicted files without discarding intentional branch work
- validate the merged result
- commit the merge
- push the updated branch
Preconditions
- the current branch should already be the PR branch you intend to update
ghshould be authenticated for the repo if you need to inspect PR metadata- do not assume a conflict is already present locally; check first
Workflow
More from arjitj2/arjit-skills
creating-skills
Use when creating a new skill, adding a skill to the user's setup, or the user says "make this a skill". All personal skills live in the arjit-skills monorepo and are symlinked into place.
2adding-a-project
Use when adding a new project to the user's personal site and resume, or when the user says to make something "live". Covers updating both arjit-me and arjit-resume, compiling the PDF, and pushing.
2frontend-slides
Create stunning, animation-rich HTML presentations from scratch or by converting PowerPoint files. Use when the user wants to build a presentation, convert a PPT/PPTX to web, or create slides for a talk/pitch. Helps non-designers discover their aesthetic through visual exploration rather than abstract choices.
2address-copilot-review
Handle GitHub Copilot PR review comments end-to-end. Use when the user asks to read Copilot's review on a pull request, decide which comments to act on, implement appropriate fixes, push follow-up commits, reply on each review thread with either the fix or the rationale for not changing code, and resolve threads that are fully addressed.
2ios-simulator-testing
End-to-end iOS simulator testing using blitz-iphone MCP and XcodeBuildMCP. Use this skill when testing an iOS app on the simulator — building, launching, interacting with the UI, and verifying state. Covers which MCP to use and when, gesture mechanics, and interaction patterns learned from real test runs.
2swiftui-design-principles
Design principles for building polished, native-feeling SwiftUI apps and widgets. Use this skill when creating or modifying SwiftUI views, iOS widgets (WidgetKit), or any native Apple UI. Ensures proper spacing, typography, colors, and widget implementations that look and feel like quality apps rather than AI-generated slop.
2