link existing folder to git repo

Identify which files are in conflict (Git should tell you this). Open each file and …

create a new branch and sync it up

If you haven’t cloned down the repo yet start with going into the folder where …