merge-conflicts icon indicating copy to clipboard operation
merge-conflicts copied to clipboard

Published 20 hours ago • verified publisher icon smashwilson

Add option to keep both changes

Open douglascamata opened this issue 8 years ago • 2 comments

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

douglascamata avatar Apr 20 '17 16:04 douglascamata

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

laughedelic avatar May 09 '17 16:05 laughedelic

: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.

smashwilson avatar May 16 '17 18:05 smashwilson