On Tuesday, June 26, 2012, Mostafa Alshrief <mostafa_alshr...@yahoo.com>
>> If any of the uncommitted changes collide with files changed between
branches, it will refuse to switch, and ask you to stash the changes first
> what do you mean by collide with files..?

If A.txt on master is different from A.txt on develop, then when you switch
branches Git must change A.txt on disk.

If you have uncommited changes, so that A.txt on disk is different from
A.txt on develop, then Git will REFUSE to switch branches if doing so would
require changing A.txt.  That's what was meant by a collision.

However, if A.txt on master is the same as A.txt on develop, then it
doesn't need to be changed when you switch branches.  Git is able to switch
without corrupting your local changes.


Gehm's Corollary to Clark's Law: Any technology distinguishable from
magic is insufficiently advanced.

You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
For more options, visit this group at 

Reply via email to