Yeah. "git pull" is so bad. I wish it didn't exist. Every single time a coworker has gotten into a stuck state is because they used "git pull" which made a merge commit when there shouldn't have been one. It's mostly stopped happening since I yelled at everyone to _please_ configure their machine with ff-only.