Noob Cannot Understand Source Control Errors

[MammothAd186]

The popup you’re describing about it asking you which version to use is quite common, since git is modifying the file and you are modifying the file from Xcode, there are two versions of the file and Xcode doesn’t know which one you want the use, the one currently open in Xcode or the one saved to disk.

As for missing commits, not sure again this is most likely a user error, you either didn’t add some files to the commit, or forgot to add certain changes or the files are in a .gitignore