AlphaUncommon
smashwilson/merge-conflicts
Resolve git merge conflicts in Atom
Archived: this repository is read-only
- Owner
- smashwilson (personal account)
- Stars
- Stars: 428
- Forks
- Forks: 39
- Language
- CoffeeScript
- License
- MIT
- Created
- 2014
- Topics
- merge-conflictsatomconflict-resolution
- Tier
- Alpha (250 to 699 ★) What this tier means
More repos by smashwilson
All 3 repos by smashwilson- smashwilson/slack-emojinatorStars: 341PythonAlpha
- smashwilson/lets-nginxStars: 172ShellPrototype
Nearby in CoffeeScript
All CoffeeScript repos- harvesthq/harveyStars: 433CoffeeScriptAlpha
- jsdf/coffee-react-transformStars: 431CoffeeScriptAlpha
- c0bra/color-scheme-jsStars: 429CoffeeScriptAlpha
- slara/generator-revealStars: 427CoffeeScriptAlpha
- jondavidjohn/payformStars: 427CoffeeScriptAlpha
- yogiben/meteor-starterStars: 425CoffeeScriptAlpha