Hi there, I want to change from release-4-5-patches to master
I am trying: git reset master git checkout master git pull error: Your local changes to 'include/resall.h' would be overwritten by merge. Aborting. Please, commit your changes or stash them before you can merge. git stash Saved working directory and index state WIP on master: 5e3473a Merge branch 'release-4-5-patches' HEAD is now at 5e3473a Merge branch 'release-4-5-patches' But I don't want branch 'release-4-5-patches'! Indeed, I am finding git very annoying to use. All I wanted in svn lingo is to change to a branch and if there's conflict, ignore all changes in my side and revert any modification to what's in the repository. Is it possible with git? Thanks, Alan -- Alan Wilter S. da Silva, D.Sc. - CCPN Research Associate Department of Biochemistry, University of Cambridge. 80 Tennis Court Road, Cambridge CB2 1GA, UK. >>http://www.bio.cam.ac.uk/~awd28<<
-- gmx-users mailing list [email protected] http://lists.gromacs.org/mailman/listinfo/gmx-users Please search the archive at http://www.gromacs.org/search before posting! Please don't post (un)subscribe requests to the list. Use the www interface or send it to [email protected]. Can't post? Read http://www.gromacs.org/mailing_lists/users.php
