search

smashwilson / merge-conflicts

Resolve git merge conflicts in Atom
https://atom.io/packages/merge-conflicts
MIT License
432 stars 42 forks source link

no longer finds conflicts #197

Closed SlimeQ closed 8 years ago

SlimeQ commented 8 years ago

i'm not totally sure why this doesn't work anymore, but the package no longer finds conflicts most of the time.

steps to reproduce

  1. git pull
  2. error: Your local changes to the following files would be overwritten by merge:
  3. atom > packages > merge-conflicts > detect
  4. screenshot from 2016-01-11 18 51 35

git status --porcelain shows that i have ~5 files mid-merge

Ubuntu 14.04 latest atom release

SlimeQ commented 8 years ago

oops, this is probably user error, my bad