For your first point make sure your git remote is using the correct format. .git/config should look like: [remote "origin"] fetch = +refs/heads/*:

For your first point make sure your git remote is using the correct format. .git/config should look like: [remote "origin"] fetch = +refs/heads/*:refs/remotes/origin/* url = git@github.com:user/repo.git