# smashwilson/merge-conflicts

<https://repo.masters-masters.com/en/repos/smashwilson/merge-conflicts>

[Home](https://repo.masters-masters.com/en) › [smashwilson](https://repo.masters-masters.com/en/owners/smashwilson) › [merge-conflicts](https://repo.masters-masters.com/en/repos/smashwilson/merge-conflicts)

smashwilson/merge-conflicts has 428 stars on GitHub. Its RepoMasters card: Alpha tier. Resolve git merge conflicts in Atom Language: CoffeeScript.

| Field | Value |
| --- | --- |
| Owner | [smashwilson](https://repo.masters-masters.com/en/owners/smashwilson) |
| Stars | 428 |
| Forks | 39 |
| Language | [CoffeeScript](https://repo.masters-masters.com/en/languages/coffeescript) |
| License | MIT |
| Created | 2014 |
| Topics | merge-conflicts, atom, conflict-resolution |
| Tier | [Alpha (250 to 699 ★)](https://repo.masters-masters.com/en/ranks/b_movie) |
| View on GitHub | [smashwilson/merge-conflicts](https://github.com/smashwilson/merge-conflicts) |

## Repository

Resolve git merge conflicts in Atom

Archived: this repository is read-only

The tier for repos with 250 to 699 ★. Published odds per card pulled: 20%. Rarity: Uncommon.

## More repos by smashwilson

- [smashwilson/slack-emojinator · ★ 341 · Python · Alpha](https://repo.masters-masters.com/en/repos/smashwilson/slack-emojinator)
- [smashwilson/lets-nginx · ★ 172 · Shell · Prototype](https://repo.masters-masters.com/en/repos/smashwilson/lets-nginx)

## Nearby in CoffeeScript

- [harvesthq/harvey · ★ 433 · CoffeeScript · Alpha](https://repo.masters-masters.com/en/repos/harvesthq/harvey)
- [jsdf/coffee-react-transform · ★ 431 · CoffeeScript · Alpha](https://repo.masters-masters.com/en/repos/jsdf/coffee-react-transform)
- [c0bra/color-scheme-js · ★ 429 · CoffeeScript · Alpha](https://repo.masters-masters.com/en/repos/c0bra/color-scheme-js)
- [slara/generator-reveal · ★ 427 · CoffeeScript · Alpha](https://repo.masters-masters.com/en/repos/slara/generator-reveal)
- [jondavidjohn/payform · ★ 427 · CoffeeScript · Alpha](https://repo.masters-masters.com/en/repos/jondavidjohn/payform)
- [yogiben/meteor-starter · ★ 425 · CoffeeScript · Alpha](https://repo.masters-masters.com/en/repos/yogiben/meteor-starter)

---
Data: GitHub · Illustration drawn by RepoMasters from the repo’s ID and its language color.