Question

I am verry new to git. I cloned a project on my local server and I edit my files with TextMate.

So, I had a branch called master. Then I created a second branch called local. I made somes modifications, added some files and commited them all. But now when I go back to my master branch, I am unable to edit with TextMate the ancient files (non modified master branch files). How is it possible to fix that? Am I supposed not to use TextMate?

Best,
Mehdi

Answer 1

Did you do something like this then:

#clone out repo that only has master branch
git clone path/to/repo

#create and checkout branch local
git checkout -b"local"

## edit files ###

#stage files
git add .

#commit changes
git commit -m"did some work"

#switch back to master
git checkout master

At this point you should be on your local master branch as you were after clone. If you want to merge in your changes from local into master:

git merge local

At any point you can run git status to see which files have changed and git branch -a to see all of the branches on your repo

If you did all of this correctly and still cant edit the files then it could be a permissions issue:

sudo chmod 644 /path/to/local/files/* -R