Re: "Not currently on any branch"

From: Steven Noonan <steven@uplinklabs.net>
Date: Oct 2, 2009, 20:58 UTC
Message-ID: <f488382f0910021358nc4a8c2ehca665c47aa39224c@mail.gmail.com>
In-Reply-To: <loom.20091002T215942-663@post.gmane.org>

On Fri, Oct 2, 2009 at 1:08 PM, Tim <timothyjwashington@yahoo.ca> wrote:

Show 13 quoted lines

> I have some code in a git repo that is "Not currently on any branch". Now,
> there's the master branch and another branch 'ui-integration' that I'm using in
> this project. I don't know how the project got into this headless state, but I
> need to be using the 'ui-integration' branch.
>
> I tried looking around the blogosphere for a solution, and tried what I found
> here. But it seems like only my last commit (not the previous 10 I made) shows
> up in the master branch (not ui-integration ).
> http://blog.kortina.net/post/71935540/fix-git-not-currently-on-any-branch-problem
>
> What's the most straightforward & cleanest way to merge my changes in the
> headless branch to my 'ui-integration' branch?
>

Try 'git checkout -b temp', which creates a branch called 'temp' with its HEAD at where you currently are, and then merge your changes to ui-integration via 'git checkout ui-integration; git merge temp', and finally drop the junk branch with 'git branch -d temp'

- Steven