From: Steffen Prohaska <prohaska@zib.de>
Date: Sun, 13 Jan 2008 14:31:19 GMT
Subject: Re: git-checkout question
Message-ID: <AF05EA04-C41A-4964-B225-E3A427D32E33@zib.de>
In-Reply-To: <20080113142140.GB10426@bach.davidneu.local>


On Jan 13, 2008, at 3:21 PM, David J. Neu wrote:

> I was wondering if someone could explain the following behavior.
>
> 1. create and switch to branch off master
> 2. edit a file in the branch
> 3. checkout master without committing changes in the branch
> 4. the changes in the branch are automatically applied in working tree
>    in master
>
> I wasn't expecting the changes in the branch to be automatically
> moved to master.  Had I committed while in the branch this doesn't
> happen.

This already is the explanation.  You did not commit.  Therefore,
the changes are not in the branch but still in your work tree.
They are on neither branch; they are _only_ in your work tree.
If you switch the branch the changes will stay in the work tree.
They always stayed in the same place: your work tree.

	Steffen