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 conflicts detected. #263

Closed nobleach closed 7 years ago

nobleach commented 7 years ago

I'm not even sure how to start troubleshooting this one:

screenshot 2017-03-13 18 18 50

I've tried changing the theme just in case. (I did notice this wasn't working with the SETI theme, so I figured changing to the default theme was worth a shot)

This file does indeed have standard diff markers. It's the first file I've ever tried with this tool, so I can't just try another conflicted file at the moment. I was just wondering if there were things I could check.

smashwilson commented 7 years ago

This looks like a duplicate of #243. Can you confirm your version of merge-conflicts, and provide the output of running git status --porcelain on the command line?

nobleach commented 7 years ago

merge-conflicts version: 1.4.4 Atom version: 1.15.0

git status --porcelain returns no output.

smashwilson commented 7 years ago

Ah, if git status --porcelain has no output, then git itself doesn't think that this file contains conflicts. (This package uses the git index to determine that a merge is in progress, not the contents of the file. git status will list the file as "modified by both" and git status --porcelain will list its path with a prefix like UU.)

How did you get these conflict markers? Were they accidentally committed from a previous merge?

nobleach commented 7 years ago

It's very possible that I resolved all but one file, then committed most of the resolved files. That would make sense.