Can you give some more details on what exactly you’re doing, what you expect to happen, and what is actually happening? I’m not sure how FTP can cause conflicts since Git doesn’t use FTP.
If you want to make sure that the tracked files in your local working copy are the same as what is contained on a specific branch on a Git remote, you can use
git reset --hard as you mentioned but you have to give it a branch that is on the remote. For example:
WARNING: Unlike most things you can do with Git, the following command IS destructive. Do NOT use it without having a backup.
git reset --hard origin/master
The above will set your working copy and the branch you’re currently on to be exactly equal to the version of the
master branch on the
I hope that helps and let me know if you have more questions.