Ash Wilson

I certainly still think it'd be cool and useful :grin: It _is_ a big expansion of scope, though. It might be better to find (or write) a `git log` package...

:wave: Thanks for taking the time to file an issue here! Unfortunately, this repository is being [deprecated](https://github.com/smashwilson/merge-conflicts/blob/master/docs/announcement.md), so I won't be getting to this one here. I don't think this...

:wave: Thanks for taking the time to file an issue here! Unfortunately, this repository is being [deprecated](https://github.com/smashwilson/merge-conflicts/blob/master/docs/announcement.md), so I won't be getting to this one here. This one should be...

This was actually fixed in smashwilson/merge-conflicts#265, I just, uh, never actually did the release. 😅 I just pushed 1.4.5 with that PR merged, but completely untested because, as some of...

merge-conflicts uses a file's status in the git index to determine whether or not conflicts exist, so this line in your status output is a hint about the problem: ```...

Weird! Yeah, ping me here if and when you reproduce. If you also happen to see this on a repository that's public, it would also be helpful to have the...

@Glavin001 Hmm. Can you share: 1. The output of `git status`? 2. The repository URL and current SHAs of the branches you're trying to merge, if the repository is public?

@Glavin001 Odd, that one _should_ have been detected as conflicting. You can tell by these lines in your status output: ``` You have unmerged paths. (fix conflicts and run "git...

This looks like a corrupted installation. Try re-installing to see if the dependencies are installed correctly.

:wave: Thanks for taking the time to file an issue here! Unfortunately, this repository is being [deprecated](https://github.com/smashwilson/merge-conflicts/blob/master/docs/announcement.md), so I won't be getting to this one here. This one should be...