search

smashwilson / merge-conflicts

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

feature request: keep both #232

Closed keyboSlice closed 8 years ago

keyboSlice commented 8 years ago

it would be nice to have a "use both" button, on occasions where both pieces of code should be kept I find myself having to use on, then undo so that I can edit conflict tags manually

keyboSlice commented 8 years ago

My apologies - I have just noticed a separate issue for this