Merge Conflicts Versions Save

Resolve git merge conflicts in Atom

v1.4.4

7 years ago

Custom repository contexts and multi-context projects. #237

v1.4.3

7 years ago

Normalize paths coming from git status. #236
Avoid overlays rendering over the MergeConflictsView. #235
Document key binding customization in the README. #235

v1.4.2

8 years ago

Rewrite the Conflict parser as a proper recursive descent parser. #229
Register custom repository contexts to move toward support for non-git repositories. #222
Transact resolve actions to group as single undo operations. #221

v1.4.1

8 years ago

Fix hangs with broken conflict markers. #220

v1.4.0

8 years ago

Handle three-way merge markers. #219
Support for nodegit operations when available, currently in Atom Beta. #205

v1.3.7

8 years ago

Resolving entire files as ours or theirs works again. #192
Use GitUtils to stage files instead of shelling out to git. #191
Update the method I was using to read the scrollbar width. #190

v1.2.4

8 years ago

Use the Decorations API to highlight lines.

v1.2.5

8 years ago

Use CSS to distinguish EditorViews instead of instanceof.

v1.2.6

8 years ago

Remove deprecated calls to keyBindingsMatchingElement and keystroke.

v1.2.7

8 years ago

Adapt to upstream EditorView changes.