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 option to keep both changes #269

Open douglascamata opened 7 years ago

douglascamata commented 7 years ago

Sometimes git is drunk and we need to keep both local and upstream changes. It would be nice to have a button for this.

laughedelic commented 7 years ago

Duplicate of https://github.com/smashwilson/merge-conflicts/issues/185? Also there is some progress in https://github.com/smashwilson/merge-conflicts/pull/200.

smashwilson commented 7 years ago

:wave: Thanks for taking the time to file an issue here! Unfortunately, this repository is being deprecated, so I won't be getting to this one here.

This one should be taken care of by the new git and GitHub package for Atom. We have "ours then theirs" and "theirs then ours" options in a drop-down menu on the conflict itself, so hopefully it'll be a bit more discoverable.