Skip to content
This repository has been archived by the owner on Nov 8, 2017. It is now read-only.

Latest commit

 

History

History
149 lines (98 loc) · 6.98 KB

CHANGELOG.md

File metadata and controls

149 lines (98 loc) · 6.98 KB
Raw

1.4.4

  • Custom repository contexts and multi-context projects. #237

1.4.3

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

1.4.2

  • 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

1.4.1

  • Fix hangs with broken conflict markers. #220

1.4.0

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

1.3.7

  • 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

1.3.6

  • Use transparency instead of mix() to allow selection to show through. #181
  • Updated the README to include how-to instructions. #178

1.3.5

  • Using the "stage" button no longer triggers a crash. #173

1.3.4

  • Scroll the merge conflicts view when many conflicts exist. #170
  • Prune some dead code. #167

1.3.3

  • With multiple projects, remember the git repository that you initially detected conflicts within. #165
  • Handle projects with no git repository. #164
  • Improve the "Git not found" error dialog. #163
  • Use alt-m instead of ctrl-m in key bindings. #162
  • Use Atom's built-in notification API. #151

1.3.2

  • Use atom.keymaps instead of atom.keymap for 1.0 compatibility. #144
  • Fix a stacktrace when resolving entire files as ours or theirs. #137

1.3.1

  • Clean up all markers when conflict detection is completed or quit. #136
  • Handle next-unresolved or previous-unresolved navigation when conflicts exist in that direction, but all are resolved. #135

1.3.0

  • Fix more deprecation warnings. #132

1.2.10

  • Don't decorate destroyed markers. #124
  • Missed a fat arrow. #125
  • Control subscription cleanup in CoveringViews. #123

1.2.9

  • It actually works again 😉
  • Use a package-global Emitter instead of atom.on #112
  • Search additional paths for git on Windows #109, #110
  • Use the TextEditor model exclusively, rather than hacking around with a TextEditorView. #108
  • Require space-pen rather than getting View and $ from Atom itself. #105, #103
  • Use new-style event subscriptions with an Emitter rather than using Emissary mixins. #104
  • Update the stylesheets to correctly target elements within the shadow DOM. #101
  • Use an overlay decoration rather than injecting controls into the TextEditorView DOM directly. #93

1.2.8

  • Deprecation cop clean sweep! #89
  • Search for git on your PATH or in common install locations if no specific path is provided. #88
  • Correctly reposition SideViews when the editor is scrolled. #87
  • Render SideView controls over the text instead of behind it. #85

1.2.7

  • Adapt to upstream EditorView changes.

1.2.6

  • Remove deprecated calls to keyBindingsMatchingElement and keystroke.

1.2.5

  • Use CSS to distinguish EditorViews instead of instanceof.

1.2.4

  • Use the Decorations API to highlight lines.

1.2.3

  • Fix a regression in detecting dirty conflict hunks.
  • Highlight the cursor line within conflict hunks.
  • Resolve: Ours Then Theirs and Resolve: Theirs Then Ours work properly when rebasing.
  • Correct React editor style to accomodate markup changes.
  • Use Ctrl-M keybindings across all platforms.
  • Cosmetic change to the error view.

1.2.2

  • Work seamlessly across React and Classic editors.
  • Show a friendlier error if git isn't found.

1.2.1

  • Fix resolution context menu items being invoked from a child element.

1.2.0

  • Consistent keymap entries on Linux, Mac and Windows.
  • Detect conflicts with Windows-style line endings.
  • Allow the resolver dialog to be dismissed and invoked later.
  • Close the resolver dialog on quitting the merge.
  • Handle "both added" conflicts.
  • Travis CI!

1.1.0

  • Special handling for conflicts encountered during a rebase.

1.0.0

  • Identification of conflict markers.
  • Superimpose conflict resolution controls.
  • Resolve conflicts as either side, directly.
  • Resolve conflicts by editing in place.
  • Navigation among conflict markers within a file.
  • Keymap entries for resolution and navigation.
  • Show resolution progress for each file.
  • Minify and restore the conflict panel.
  • Save and stage changes for each file on completion.