merge-conflicts

smashwilson

Resolve git merge conflicts in Atom

atom

View on GitHub Website

429 Stars

38 Forks

429 Watchers

CoffeeScript Language

mit License

100 SrcLog Score

Cost to Build

$483.6K

Market Value

$1.04M

How is this calculated?

Growth over time

11 data points · 2019-02-01 → 2026-04-01

Stars Forks Watchers

💬

How do you feel about this project?

Ask AI about merge-conflicts

Question copied to clipboard

What is the smashwilson/merge-conflicts GitHub project? Description: "Resolve git merge conflicts in Atom". Written in CoffeeScript. Explain what it does, its main use cases, key features, and who would benefit from using it.

Question is copied to clipboard — paste it after the AI opens.

How to clone merge-conflicts

Clone via HTTPS

git clone https://github.com/smashwilson/merge-conflicts.git

Clone via SSH

[email protected]:smashwilson/merge-conflicts.git

Download ZIP

Download master.zip

Found an issue?

Report bugs or request features on the merge-conflicts issue tracker:

Open GitHub Issues

Similar to merge-conflicts

atom dracula-theme codelf hydrogen teletype awesome-atom markdown-preview-enhanced go-plus atom-beautify simplepie atom-vim-mode-plus apm MagicPython vienna-rss atomic-chrome miniflux-legacy merlin oneDNN atom gofeed seti-ui prettier-atom v2 atom-one-dark-terminal proton raven-reader github linter-eslint atom-plugins atom-project-manager