Hi there,<div><br></div><div>I want to change from release-4-5-patches to master</div><div><br></div><div>I am trying:</div><div><br></div><div>git reset master</div><div>git checkout master</div><div><br></div><div><div>git pull</div>
<div>error: Your local changes to 'include/resall.h' would be overwritten by merge. Aborting.</div><div>Please, commit your changes or stash them before you can merge.</div></div><div><br></div><div>git stash</div>
<div><div>Saved working directory and index state WIP on master: 5e3473a Merge branch 'release-4-5-patches'</div><div>HEAD is now at 5e3473a Merge branch 'release-4-5-patches'</div></div><div><br></div><div>
But I don't want branch 'release-4-5-patches'!</div><div><br></div><div>Indeed, I am finding git very annoying to use.</div><div><br></div><div>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.</div>
<div><br></div><div>Is it possible with git?</div><div><br></div><div>Thanks,</div><div><br></div><div>Alan</div><div><br></div><div><br>-- <br>Alan Wilter S. da Silva, D.Sc. - CCPN Research Associate<br>Department of Biochemistry, University of Cambridge. <br>
80 Tennis Court Road, Cambridge CB2 1GA, UK.<br>>><a href="http://www.bio.cam.ac.uk/~awd28">http://www.bio.cam.ac.uk/~awd28</a><<<br>
</div>