From: Johannes Schindelin Date: Tue, 05 Feb 2008 15:07:12 GMT Subject: Re: [Bug?] uncommited changes cross branches Message-ID: In-Reply-To: Hi, On Tue, 5 Feb 2008, Rhodes, Kate wrote: > If you have a file that exists in two branches in the same repo, make a > change to it without committing, then switch branches the changes carry > over, but if you make changes to a file that exists in only one of the > repos and try and switch branches Git complains that the file isn't > uptodate. The latter behavior seems correct to me. It is slightly different: if you change a file without committing _-and- the switch to another branch does not touch the file, git does not complain. The rationale: git should refuse to switch branches _only_ if uncommitted changes would be lost. However, if you change a file whose content is different in the other branch (and "not existing" qualifies), the uncommitted changes would be lost, and git should complain. Ciao, Dscho