Using GIT with GIT GUI - Master and Branching

git branch msysgit git-gui
R P picture R P · Dec 22, 2009 · Viewed 8.6k times · Source

I am trying out GIT, and using the GIT GUI (from msysgit) with it.

I am trying to make a new branch, but somehow it keeps taking over the master branch. The master branch still appears, but not as the actual master. As a result, I also can't merge my new branch into the master, but it requests me to do the opposite (master into new branch).

Another problem that I have come across (not sure if related), is that GIT GUI is not allowing me to switch between the Master and branch (with check out) without actually merging the two. As far as I understood, this is not a necessary requirement for switching between master and branches.

Thanks...

Answer

asm picture asm · Dec 22, 2009

I've never used gitgui so I can't help you there but you could try performing the same operations at the command line to make sure things are working at that level. To create a branch from the master and check it out at the same time you would use

git checkout -b <new branch name> [old branch name]

Where [old branch name] would be master. If this is omitted the current branch is used. To switch between branches you would use

git branch <destination branch>

To switch to destination branch. You can list all of the existing branches with

git branch -a

Learning to use git at the command line may be a good idea, you're likely to find more documentation for command line use than for gui use.

[edit]

When you say it makes you merge the two branches what error are you getting? git will not allow you to switch off a branch when you have a dirty working copy. If your working copy has changes you either need to commit them or if you don't want to commit your changes you can stash them using the 'git stash' command (you could also reset your head and throw the changes away completely). Is this what you're seeing when you say that git is making you merge the two branches?

Related questions

How can I find out which files have been modified in a branch?

I have two branches: master and bug1. I checked out bug1, did bunch of changes and multiple commits. How do I get a list of all files that were changed on the branch? I'm not interested in hashes, dates or …

Read More
git - changes to branch since created?

I'm always asking myself a set of questions about branches i've created that i've yet to determine how to accomplish: What files did i change in branch? What are the actually changes (diff) i made to the branch? What is …

Read More
Git fetch remote branch

My colleague and I are working on the same repository. We've branched it into two branches, each technically for different projects, but they have similarities, so we'll sometimes want to commit back to the *master from the branch. However, I …

Read More