[gmx-users] help with git

[Alan]

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<<
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://maillist.sys.kth.se/pipermail/gromacs.org_gmx-users/attachments/20100824/206ae368/attachment.html>