I’m about to commit a final checkin in my project before I merge to master. I’ve staged my changes, but when I try to commit I get an error about conflicts:

How to recover deleted local code during a pull in Xcode? In Xcode, local code that hasn’t been submitted or pushed was directly overwritten and deleted after clicking pull. Even the code with conflicts was directly deleted and overwritten.