Thanks Carsten, but now nothing is not working, not even what was doing so:
git reset --hard HEAD is now at 5e3473a Merge branch 'release-4-5-patches' amadeus[2216]:~/workspace/gromacs% git checkout release-4-5-patches Already on 'release-4-5-patches' Your branch and 'origin/release-4-5-patches' have diverged, and have 37 and 31 different commit(s) each, respectively. amadeus[2217]:~/workspace/gromacs% git pull Auto-merging include/physics.h Auto-merging include/resall.h CONFLICT (content): Merge conflict in include/resall.h Auto-merging include/string2.h CONFLICT (content): Merge conflict in include/string2.h Auto-merging include/vec.h CONFLICT (content): Merge conflict in include/vec.h Auto-merging src/gmxlib/string2.c Auto-merging src/kernel/gen_vsite.c Auto-merging src/kernel/pdb2gmx.c Auto-merging src/kernel/pdb2top.c CONFLICT (content): Merge conflict in src/kernel/pdb2top.c Auto-merging src/kernel/resall.c Auto-merging src/kernel/ter_db.c Auto-merging src/tools/gmx_membed.c Automatic merge failed; fix conflicts and then commit the result. amadeus[2218]:~/workspace/gromacs% On 24 August 2010 12:10, Carsten Kutzner <[email protected]> wrote: > On Aug 24, 2010, at 12:57 PM, Alan wrote: > > 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. > > git reset --hard > will remove all your modifications to that branch that are not checked in > yet. You might > want to save include/resall.h elsewhere if you still need your > modifications. > > Then > git checkout master > > will check out the master branch. You might need to "git pull" after you > checked > out the master so that you are up-to-date with the gromacs repository. > > Carsten > > > 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 > > > > -- > Dr. Carsten Kutzner > Max Planck Institute for Biophysical Chemistry > Theoretical and Computational Biophysics > Am Fassberg 11, 37077 Goettingen, Germany > Tel. +49-551-2012313, Fax: +49-551-2012302 > http://www.mpibpc.mpg.de/home/grubmueller/ihp/ckutzne > > > > > > -- > 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 > -- 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
