Question

I have a Git repo that has been acting funny.

I can checkout all of my branches, I can work on each of them normally, and I can perform gitk to each one and view their individual commits successfully — with one exception…

…. there is one branch that I can’t seem to access. With any action I try to perform that includes the flawed branch, I receive an error.

For example: gitk --all yields fatal: blah blah blah (as a side note, more details about the error can be viewed here, but I am trying to come by a solution from a totally different angle).

The Question

Is there a way to recombine all of the other, working branches together such that I can use this repo again — only losing the commits from the broken branch since the broken branch does not have any other branches extending from it?

Answer 1

You could create a remote and push all your ‘good’ branches onto that remote. Then in a new local directory, do a git clone of that remote.

After that, if you do git branch -a you should see all your local and remote branches. You can create a local tracking branch for each remote branch with:

    git checkout -b branch remote/branch

After this, you should have a local repo with all ‘good’ branches.