Colin Law wrote: > > 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
This seems to be the case. I built and installed Git-1.6.2-1 and I get the same behaviour as I observed with 1.5.5. $ git pull ... $ git co -b newbranch $ echo junk > README $ git status # On branch newbranch # Changed but not updated: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: README # no changes added to commit (use "git add" and/or "git commit -a") $ $ git co master M README Switched to branch "master" [byrn...@inet04 proforma.git]$ git status # On branch master # Changed but not updated: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: README # no changes added to commit (use "git add" and/or "git commit -a") I am still somewhat vague as to what is happening here but now at least I know what to expect and that suffices. -- 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 -~----------~----~----~----~------~----~------~--~---
