merge-conflicts
merge-conflicts copied to clipboard
smashwilson
Resolve git merge conflicts in Atom
The "Keep Left" / "Keep Right" option is occasionally useful; often I need a combination of Left and Right. Most graphically diff-ing tools support a "Keep Both" option that allows...
Sometimes `git` is drunk and we need to keep both local and upstream changes. It would be nice to have a button for this.
I work on files over a mount, and running merge-conflicts takes about 3-4 minutes to load. Is it possible to ask it to only search a particular folder in the...
This is a very early attempt to add support to skip the stage part of Merge Conflicts. All changes connected to MergeState is a second part planned to do a...
Atom's [block decorations](http://blog.atom.io/2016/02/03/introducing-block-decorations.html) seem like a good fit for rendering the merge controls within TextEditors, but they aren't quite there yet. I think I'll need support for a `position: "replace"`...
The plugin supports resolution via "Keep Both" methods `acceptOursThenTheirs()` and `acceptTheirsThenOurs()` but those options are "hidden" underneath the contextual menu (well, _I_ certainly never thought to right-click on the conflict)....
I'd love not to have to close the window after dealing with conflicts. Would it be possible to add an option to auto-stage file when all conflicts are resolved ?...
_From @nobalmohan on May 26, 2016 12:10_ [Enter steps to reproduce below:] **Atom Version**: 1.7.4 **System**: Microsoft Windows 10 Home Single Language **Thrown From**: Atom Core ### Stack Trace Uncaught...
The UI is showing up over Atom's footer bar:  This scrolls together with the file contents. Seems to be a z-index issue. Atom 1.9.0-dev-7253514, Merge conflicts 1.4.3.
This was actually one of the first ideas I'd had for this package, and for whatever reason I never got around to doing it, or writing it down. On each...