merge-conflicts
merge-conflicts copied to clipboard
smashwilson
Resolve git merge conflicts in Atom
Windows 7, Atom 1.0.11, merge-conflicts 1.3.5. When I attempt to run merge-conflicts I get ``` git can't be found in any of the default locations! ``` I checked my PATH...
[Enter steps to reproduce below:] 1. Once done with merge conflicts click on stage **Atom Version**: 1.0.7 **System**: Mac OS X 10.10.3 **Thrown From**: [merge-conflicts](https://github.com/smashwilson/merge-conflicts) package, v1.3.5 ### Stack Trace...
It seems like I am getting bitten by a _Nothing to Merge_ issue. After running `git rebase master` on a branch and it created conflicts, I get the following `status`:...
Enhancement, when i take their changes, or ours changes, i could not go back ? like undo ? Is it possible to add this feature ?
Reproduce: Open file with long lines and conflicts, run merge conflicts. Problem: Hint Ctrl+M 1 and 2 is hidden from view, I must scroll to end of the line to...
This package is a great way to resolve merge conflicts. It makes the whole process a lot faster. However, quite often merging is a lot more complex than just picking...
(This is an enhancement request. Apologies if it's outside the scope of development.) This package could leverage the already stellar merge interface and the git diff command to allow the...
Conflict markers are _modify-modify_ conflicts, indicated by `U U` in `git status --porcelain`, but there are [other conflicts that are possible](https://www.kernel.org/pub/software/scm/git/docs/git-status.html#_short_format): _modify and delete_, _both added_, and so on. Resolution...
Shelling out to `git` is kind of fragile and hacky. The Right Thing To Do :tm: is to extend https://github.com/atom/git-utils with the functionality that I'll need, make pull requests, and...