I have a project with multiple branches. I’ve been pushing them to GitHub, and now that someone else is working on the project I need to pull their branches from GitHub. It works fine in master. But say that someone created a branch xyz. How can I pull branch xyz from GitHub and merge it … Read more
In my current repo I have the following output: $ git branch -a * master remotes/origin/master remotes/public/master I want to delete remotes/public/master from the branch list: $ git branch -d remotes/public/master error: branch ‘remotes/public/master’ not found. Also, the output of git remote is strange, since it does not list public: $ git remote show origin … Read more
I’ve tried git branch -r, but that only lists remote branches that I’ve tracked locally. How do I find the list of those that I haven’t? (It doesn’t matter to me whether the command lists all remote branches or only those that are untracked.) 20 s 20 For the vast majority[1] of visitors here, the … Read more
I have a local Git repository called ‘skeleton’ that I use for storing project skeletons. It has a few branches, for different kinds of projects: casey@agave [~/Projects/skeleton] git branch * master rails c c++ If I want to check out the master branch for a new project, I can do casey@agave [~/Projects] git clone skeleton … Read more
See also: How can I see which Git branches are tracking which remote / upstream branch? How can I find out which remote branch a local branch is tracking? Do I need to parse git config output, or is there a command that would do this for me? 24 s 24 Here is a command … Read more
Somehow my master and my origin/master branch have diverged. I actually don’t want them to diverge. How can I view these differences and merge them? 1 17 I had this and am mystified as to what has caused it, even after reading the above responses. My solution was to do git reset –hard origin/master Then … Read more
I’ve seen these words a lot around Subversion (and I guess general repository) discussions. I have been using SVN for my projects for the last few years, but I’ve never grasped the complete concept of these directories. What do they mean? 1 16
Closed. This question is opinion-based. It is not currently accepting answers. Want to improve this question? Update the question so it can be answered with facts and citations by editing this post. Closed 5 years ago. Improve this question I’ve been using a local git repository interacting with my group’s CVS repository for several months, … Read more
If I run git branch -d XYZ, is there a way to recover the branch? Is there a way to go back as if I didn’t run the delete branch command? 2 21 Yes, you should be able to do git reflog –no-abbrev and find the SHA1 for the commit at the tip of your … Read more
I use the following command to push to my remote branch: git push origin sandbox If I say git push origin does that push changes in my other branches too, or does it only update my current branch? I have three branches: master, production and sandbox. The git push documentation is not very clear about … Read more
