42 Forks
433 Stars
433 Watchers

merge-conflicts

Resolve git merge conflicts in Atom

How to download and setup merge-conflicts

Open terminal and run command
git clone https://github.com/smashwilson/merge-conflicts.git
git clone is used to create a copy or clone of merge-conflicts repositories. You pass git clone a repository URL.
it supports a few different network protocols and corresponding URL formats.

Also you may download zip file with merge-conflicts https://github.com/smashwilson/merge-conflicts/archive/master.zip

Or simply clone merge-conflicts with SSH
[email protected]:smashwilson/merge-conflicts.git

If you have some problems with merge-conflicts

You may open issue on merge-conflicts support forum (system) here: https://github.com/smashwilson/merge-conflicts/issues

Similar to merge-conflicts repositories

Here you may see merge-conflicts alternatives and analogs

 atom    MagicPython    Handlebars    themecreator    dracula-theme    prettier-atom    linter-eslint    python-tools    platformio-atom-ide    codelf    hydrogen    teletype    awesome-atom    markdown-preview-enhanced    go-plus    atom-beautify    simplepie    atom-vim-mode-plus    apm    vienna-rss    atomic-chrome    miniflux-legacy    merlin    oneDNN    atom    gofeed    seti-ui    v2    atom-one-dark-terminal    proton