2009/3/27 Robert Walker <[email protected]> > > Colin Law wrote: > > Not really, they are not on a branch, your working copy is just a set of > > files in your folders. When you switch branches git overwrites them > > with > > the version from the repository for that branch, unless they have been > > modified but not committed, in which case it does not overwrite them. > > I'm not sure what version of git you're using, but I just did a sanity > check with a simple git repository. The version of git I'm using > (1.6.1.3) wouldn't let me switch to another branch with local changes to > the working directory. I had to use git checkout --merge master, which > then performed a 3-way merge between the versions on the branch, master > and working. In this case the file did conflict, as it should have, > After using git mergetool to resolve the conflicts then I was able to > commit the merged file into the master branch.
I am using 1.5.6.3 on ubuntu. I think the situation you are describing may be because the file has been modified on the master and branch. I think if you make a new branch, checkout the branch, modify a file without committing (or staging) then checkout the master it will let you do it and leave the file modified > > > Note that in this case both the branch and master had versions of the > file committed previously. > -- > Posted via http://www.ruby-forum.com/. > > > > --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Ruby on Rails: Talk" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/rubyonrails-talk?hl=en -~----------~----~----~----~------~----~------~--~---
