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.
  ☆98Updated 6 years ago
• nikhilkalige / docblockr
  DocBlockr is a package for Atom which is designed to make writing documentation faster and easier.
  ☆405Updated last year
• atom / fuzzy-finder
  Find and open files quickly
  ☆277Updated 2 years ago
• danielbrodin / atom-project-manager
  Project manager for the Atom editor
  ☆511Updated 2 years ago
• f / atom-term2
  THIS PROJECT IS NO LONGER MAINTAINED. PLEASE USE ATOM TERM3 PACKAGE
  ☆294Updated 7 years ago
• atom / sort-lines
  An Atom package to sort lines of text
  ☆173Updated 2 years ago
• mrodalgaard / atom-todo-show
  Atom package that shows a list of todos from your project.
  ☆182Updated 5 years ago
• atom-community / tool-bar
  Package providing customisable toolbar for Atom
  ☆160Updated last year
• AtomLinter / linter-jshint
  Atom linter plugin for JavaScript, using jshint.
  ☆147Updated last year
• littlebee / git-time-machine
  Atom package that allows you to travel back in commit history
  ☆1,117Updated 3 years ago
• jacogr / atom-git-control
  Not maintained :(
  ☆227Updated 6 years ago
• notwaldorf / github-canned-responses
  (inactive) Because copy pasting isn't that great.
  ☆369Updated 7 years ago
• ignism / nucleus-dark-ui
  Atom UI theme
  ☆112Updated 6 years ago
• sindresorhus / atom-linter-xo
  Linter for XO
  ☆87Updated 3 years ago
• atom / snippets
  Atom snippets package
  ☆205Updated last year
• blakeembrey / atom-dash
  Dash documentation integration with Atom
  ☆394Updated 5 years ago
• akonwi / git-plus
  vim-fugitive like package for atom. make commits and other git things without the terminal
  ☆537Updated 2 years ago
• npms-io / npms-cli
  The CLI search utility for npms
  ☆262Updated last year
• lee-dohm / package-sync
  Atom package synchronization across machines
  ☆61Updated 7 years ago
• jeremyramin / terminal-plus
  A terminal package for Atom, complete with themes and more.
  ☆479Updated 4 years ago
• abe33 / atom-pigments
  An Atom package to display colors in project and files.
  ☆520Updated 2 years ago
• atom / git-diff
  Diff markers in Atom's gutter
  ☆102Updated 6 years ago
• noseglid / atom-build
  Build your project directly from the Atom editor
  ☆245Updated 3 years ago
• imdone / imdone-atom
  imdone-atom has been archived
  ☆223Updated 5 years ago
• danhper / atomic-chrome-atom
  Edit Chrome textareas in Atom
  ☆92Updated 7 years ago
• defunkt / Zen
  Distraction free writing for Atom.
  ☆192Updated 5 years ago
• lee-dohm / tabs-to-spaces
  package for converting between tabs and spaces
  ☆70Updated 6 years ago
• nikhilkalige / git-log
  A Atom package for git commit graphs
  ☆71Updated 7 years ago