A repository appeared to have one ordinary conflict, but its state carried two different kinds of unfinished work. One configuration path had multiple unmerged entries in the Git index. A separate source file already contained an intentional staged change. There was no active merge, rebase, or …