Alternatives and similar repositories for merge-conflicts

Users that are interested in merge-conflicts are comparing it to the libraries listed below

• Osmose / advanced-open-file
  Open files and folders in Atom easily.
  ☆118Updated 3 years ago
• alexcorre / git-blame
  Plugin for Atom Editor. Toggle git-blame annotations for the current file in the gutter.
  ☆100Updated 6 years ago
• f / atom-term2
  THIS PROJECT IS NO LONGER MAINTAINED. PLEASE USE ATOM TERM3 PACKAGE
  ☆294Updated 8 years ago
• danielbrodin / atom-project-manager
  Project manager for the Atom editor
  ☆511Updated 3 years ago
• atom / sort-lines
  An Atom package to sort lines of text
  ☆173Updated 2 years ago
• sindresorhus / atom-linter-xo
  Linter for XO
  ☆87Updated 4 years ago
• Pulsar-Edit-Highlights / line
  @Pulsar-Edit package for highlighting the currently selected line.
  ☆52Updated 2 years ago
• defunkt / Zen
  Distraction free writing for Atom.
  ☆192Updated 6 years ago
• lee-dohm / tabs-to-spaces
  package for converting between tabs and spaces
  ☆70Updated 7 years ago
• AtomLinter / linter-jshint
  Atom linter plugin for JavaScript, using jshint.
  ☆147Updated last year
• atom / git-diff
  Diff markers in Atom's gutter
  ☆102Updated 6 years ago
• philschatz / atom-pull-requests
  View/Edit comments on a Pull Request directly inside the Atom Editor
  ☆47Updated 7 years ago
• nikhilkalige / docblockr
  DocBlockr is a package for Atom which is designed to make writing documentation faster and easier.
  ☆404Updated 2 years ago
• imdone / imdone-atom
  imdone-atom has been archived
  ☆224Updated 5 years ago
• atom / fuzzy-finder
  Find and open files quickly
  ☆278Updated 2 years ago
• jacogr / atom-git-control
  Not maintained :(
  ☆226Updated 6 years ago
• lee-dohm / package-sync
  Atom package synchronization across machines
  ☆61Updated 7 years ago
• danhper / atomic-chrome-atom
  Edit Chrome textareas in Atom
  ☆92Updated 7 years ago
• notwaldorf / github-canned-responses
  (inactive) Because copy pasting isn't that great.
  ☆371Updated 7 years ago
• nikhilkalige / git-log
  A Atom package for git commit graphs
  ☆71Updated 7 years ago
• ignism / nucleus-dark-ui
  Atom UI theme
  ☆112Updated 6 years ago
• atom-community / tool-bar
  Package providing customisable toolbar for Atom
  ☆161Updated last year
• mehcode / atom-project-plus
  Simply awesome project management in Atom.
  ☆99Updated 8 years ago
• atom / toggle-quotes
  An Atom package to toggle between single and double quotes
  ☆77Updated 2 years ago
• npms-io / npms-cli
  The CLI search utility for npms
  ☆264Updated last year
• atom / whitespace
  Atom whitespace package
  ☆94Updated 2 years ago
• littlebee / git-time-machine
  Atom package that allows you to travel back in commit history
  ☆1,114Updated 3 years ago
• mattbanks / dotfiles-syntax-highlighting-st2
  User settings to bring ShellScript (Bash) syntax highlighting to dotfiles
  ☆210Updated 6 years ago
• sindresorhus / term-img-cli
  Display images in iTerm
  ☆83Updated 10 months ago
• DavidLGoldberg / jumpy
  The fastest way to jump around files and across visible panes in Atom
  ☆123Updated 3 years ago