gitmyhub

merge-conflicts

CoffeeScript ★ 0 updated 9y ago ⑂ fork

Resolve git merge conflicts in Atom

No plain-English explanation yet — one is being written right now. Check back in a minute.