---
title: "Git Conflict Resolution - Air Market"
description: "Merge conflicts are where careful work gets lost, especially in lock files or when one side deleted a file the other changed. This gives you a structured way through them, covering imports, tests, lo…"
canonical: "https://airmarket.ai/app/resolve-conflicts"
---

[Air Market](/) / [Developer Tools](/category/devtools) / Git Conflict Resolution

Skill by [Tailcall](/@tailcallhq)

# Git Conflict Resolution

A way through merge conflicts that does not rely on nerve

## What this does

Merge conflicts are where careful work gets lost, especially in lock files or when one side deleted a file the other changed. This gives you a structured way through them, covering imports, tests, lock file regeneration, config files and the awkward deleted-but-modified case, with backups and analysis along the way.

### Top 3 things it does for you

- Work through a merge conflict with a method
- Sort out conflicting imports and tests
- Deal with a conflicted lock file

## Information

**Git Conflict Resolution at a glance**

|  |  |
| --- | --- |
| Kind | Skill |
| Publisher | [Tailcall](/@tailcallhq) |
| Category | [Developer Tools](/category/devtools) |
| Works with | Agent Skills - an open standard supported by 40+ agents |
| Size | 39 KB |
| Licence | Apache-2.0 |
| Repository | [tailcallhq/forgecode](https://github.com/tailcallhq/forgecode/tree/8a753c653d2a68d99390444829dc55817860abfe/.forge/skills/resolve-conflicts) |
| GitHub stars | 7,504 (as of Nov 2026) |
| Installs | 687, counted by skills.sh (Nov 2026) |

## Security report

**Verified.** AIR scanned this exact version of Git Conflict Resolution and flagged nothing. AIR's verdict: **safe**.

**What Git Conflict Resolution's check was run against**

|  |  |
| --- | --- |
| Commit | 8a753c653d2a68d99390444829dc55817860abfe |
| Content hash | c1b81e2d6e129839606c13169ed7819da73f72ffbdfd17a26032162f2b4daacb |
| Files read | [Browse the files at this exact commit](https://github.com/tailcallhq/forgecode/blob/8a753c653d2a68d99390444829dc55817860abfe/.forge/skills/resolve-conflicts/SKILL.md) |

A scan is named by the exact content it read, not by a version number. A different version is a different artifact, and nothing here applies to a version AIR has not scanned.

[Read the full security report for Git Conflict Resolution](/security/resolve-conflicts)

## About Git Conflict Resolution

A structured framework for resolving merge conflicts. It covers merging imports, tests, lock files through regeneration, and configuration files, and it handles deleted-but-modified files with backup and analysis.

Reach for it as soon as merge conflicts come up, rather than working through them directly.

## What's inside

- SKILL.md - instructions
- references/patterns.md - reference
- references/sample-plan.md - reference
- scripts/handle-deleted-modified.sh - script
- scripts/validate-conflicts.sh - script

## Questions

### Is Git Conflict Resolution safe to install?

AIR scanned this exact version of Git Conflict Resolution and flagged nothing. AIR's verdict: safe. The verdict is named by the content that was read, at commit 8a753c653d2a, so it cannot drift onto a version nobody scanned. The full report is at https://airmarket.ai/security/resolve-conflicts.

### How do I install Git Conflict Resolution?

Open https://airmarket.ai/app/resolve-conflicts on Air Market and use the install action: Air Market hands Claude a prompt naming this exact skill, and Claude sets it up. Source, pinned to the exact commit this listing describes: https://github.com/tailcallhq/forgecode/tree/8a753c653d2a68d99390444829dc55817860abfe/.forge/skills/resolve-conflicts. Install from that link, not the branch.

## Related on Air Market

- [More Developer Tools listings](/category/devtools)
- [Everything by Tailcall](/@tailcallhq)

---

Canonical URL: <https://airmarket.ai/app/resolve-conflicts>