This question already has answers here: Move existing, uncommitted work to a new branch in Git (11 answers) Closed 8 years ago. I’ve been editing some modules on the master branch but I haven’t committed them. I’m now thinking that these changes should really be on an experimental branch and not the master branch. How … Read more
Does anybody know the difference between these two commands to switch and track a remote branch? git checkout -b branch origin/branch git checkout –track origin/branch I think both keep track of the remote branch so I can push my changes to the branch on origin, right? Are there any practical differences? 4 Answers 4
I’ve pulled all remote branches via git fetch –all. I can see the branch I’d like to merge via git branch -a as remotes/origin/branchname. Problem is it is not accessible. I can’t merge or checkout. 5 Answers 5
Alright, lets say one day we make happen to make a bunch of modifications and when we go to commit them we notice we were working on the wrong branch. How can we force git to switch branches without discarding local changes. I’m probably going to go about this in a naive way while I … Read more
I have cloned a repository, after which somebody else has created a new branch, which I’d like to start working on. I read the manual, and it seems dead straight easy. Strangely it’s not working, and all the posts I’ve found suggest I’m doing the right thing. So I’ll subject myself to the lambasting, because … Read more
This question already has answers here: Move branch pointer to different commit without checkout (11 answers) Closed 2 years ago. In Git, I understand that a branch is a pointer to a commit. How do I make a specific branch point to a specific commit? Say I want to make master point at 1258f0d0aae…, how … Read more
Suppose we have an application that’s stable. Tomorrow, someone reports a big ol’ bug that we decide to hotfix right away. So we create a branch for that hotfix off of “master”, we name it “2011_Hotfix”, and we push it up so that all of the developers can collaborate on fixing it. We fix the … Read more
I have a git branch called 9-sign-in-out with perfectly working code, and I want to turn it into the master. I’m currently on the master branch. $ git branch 9-sign-in-out * master I’m trying to switch to 9-sign-in-out branch, but it doesn’t allow me to: $ git checkout 9-sign-in-out app/helpers/application_helper.rb: needs merge config/routes.rb: needs merge … Read more
How do I rename an existing branch in a Git repo? I want the current branch to have a new name. 2 Answers 2
I’ve got a project hosted on GitHub which somebody has forked. On their fork, they’ve created a new branch “foo” and made some changes. How do I pull their “foo” into a new branch also named “foo” in my repo? I understand they could submit a pull request to me, but I’d like to initiate … Read more
