How to get changes from another branch

I am currently working on featurex branch. Our master branch is named our-team. Since I started working on featurex, more changes have been made to branch our-team. I have done this locally to get all the latest changes from our-team: git checkout our-team git pull Before I push featurex for merging, I would locally like … Read more

Setting up a git remote origin

I have the following repos. DEV REPO: in a directory on my development machine where i make changes MAIN REPO: bare repository on my development machine to which i push changes from dev repo PRODUCTION REPO: repository on host machine to pull updates from the main repo I used git remote add origin /Users/me/sites/main_repo to … Read more

‘git branch -av’ showing remote branch that no longer exists

This is probably a dumb question, but I’m brand new to git and am seeing a remote branch that no longer exists. $ git branch -a * master remotes/origin/master remotes/origin/production I don’t believe the production branch exists remotely and can’t figure out why it still shows locally. How can I delete/remove this branch? Here’s what … Read more

git:// protocol blocked by company, how can I get around that?

Attempting something like git clone git://github.com/ry/node.git will not work, it results in: Initialized empty Git repository in /home/robert/node/.git/ github.com[0: 207.97.227.239]: errno=Connection timed out fatal: unable to connect a socket (Connection timed out) However, cloning over HTTP works fine. So far I’ve gathered that it’s a problem with the protocol, but I’m trying to install cloud9 … Read more