Stack overflow sent me here because my question wasn't deemed good for the site so apologies if it's the wrong place.
I'm using ATOM IDE with git. I've began merging another branch with my master. Atom has shown me the merge conflicts to choose from and i've accidentally chosen the wrong merge conflict. I chose the master version and not the other branch's version. I choose abort merge but whenever I try to merge again it remembers the choice I made and doesn't allow me to choose the actual conflict I wanted to choose. I've even tried a hard reset and atom still remembers! How to I choose the other merge conflict D:
