search

smashwilson / merge-conflicts

Resolve git merge conflicts in Atom
https://atom.io/packages/merge-conflicts
MIT License
432 stars 42 forks source link

Add three-way merge markers support #219

Closed ypresto closed 8 years ago

ypresto commented 8 years ago

Closes #9

smashwilson commented 8 years ago

!!!

That's awesome!

ypresto commented 8 years ago

I did it!!! :smiley:

smashwilson commented 8 years ago 
~/code/merge-conflicts docker:dev (master=) 
$ apm publish minor
Preparing and tagging a new version ✓
Pushing v1.4.0 tag ✓
Publishing merge-conflicts@v1.4.0 ✓
varemenos commented 8 years ago

thank you very much for this!