[gmx-users] help with git
alanwilter at gmail.com
Tue Aug 24 12:57:46 CEST 2010
I want to change from release-4-5-patches to master
I am trying:
git reset master
git checkout master
error: Your local changes to 'include/resall.h' would be overwritten by
Please, commit your changes or stash them before you can merge.
Saved working directory and index state WIP on master: 5e3473a Merge branch
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
Is it possible with git?
Alan Wilter S. da Silva, D.Sc. - CCPN Research Associate
Department of Biochemistry, University of Cambridge.
80 Tennis Court Road, Cambridge CB2 1GA, UK.
-------------- next part --------------
An HTML attachment was scrubbed...
More information about the gromacs.org_gmx-users