Thanks Carsten, but now nothing is not working, not even what was doing so:<div><br></div><div><div>git reset --hard</div><div>HEAD is now at 5e3473a Merge branch 'release-4-5-patches'</div><div>amadeus[2216]:~/workspace/gromacs% git checkout release-4-5-patches </div>
<div>Already on 'release-4-5-patches'</div><div>Your branch and 'origin/release-4-5-patches' have diverged,</div><div>and have 37 and 31 different commit(s) each, respectively.</div><div>amadeus[2217]:~/workspace/gromacs% git pull</div>
<div>Auto-merging include/physics.h</div><div>Auto-merging include/resall.h</div><div>CONFLICT (content): Merge conflict in include/resall.h</div><div>Auto-merging include/string2.h</div><div>CONFLICT (content): Merge conflict in include/string2.h</div>
<div>Auto-merging include/vec.h</div><div>CONFLICT (content): Merge conflict in include/vec.h</div><div>Auto-merging src/gmxlib/string2.c</div><div>Auto-merging src/kernel/gen_vsite.c</div><div>Auto-merging src/kernel/pdb2gmx.c</div>
<div>Auto-merging src/kernel/pdb2top.c</div><div>CONFLICT (content): Merge conflict in src/kernel/pdb2top.c</div><div>Auto-merging src/kernel/resall.c</div><div>Auto-merging src/kernel/ter_db.c</div><div>Auto-merging src/tools/gmx_membed.c</div>
<div>Automatic merge failed; fix conflicts and then commit the result.</div><div>amadeus[2218]:~/workspace/gromacs% </div></div><div><br></div><div><br><br><div class="gmail_quote">On 24 August 2010 12:10, Carsten Kutzner <span dir="ltr"><<a href="mailto:ckutzne@gwdg.de">ckutzne@gwdg.de</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;"><div style="word-wrap:break-word"><div><div class="im"><div>On Aug 24, 2010, at 12:57 PM, Alan wrote:</div><br><blockquote type="cite">
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>
</blockquote></div>git reset --hard </div><div>will remove all your modifications to that branch that are not checked in yet. You might</div><div>want to save include/resall.h elsewhere if you still need your modifications.</div>
<div><br></div><div>Then </div><div>git checkout master</div><div><br></div><div>will check out the master branch. You might need to "git pull" after you checked</div><div>out the master so that you are up-to-date with the gromacs repository.</div>
<div><br></div><div>Carsten</div><div><br><blockquote type="cite"><div class="im">
<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" target="_blank">http://www.bio.cam.ac.uk/~awd28</a><<<br>
</div></div><div class="im">
-- <br>gmx-users mailing list <a href="mailto:gmx-users@gromacs.org" target="_blank">gmx-users@gromacs.org</a><br><a href="http://lists.gromacs.org/mailman/listinfo/gmx-users" target="_blank">http://lists.gromacs.org/mailman/listinfo/gmx-users</a><br>
Please search the archive at <a href="http://www.gromacs.org/search" target="_blank">http://www.gromacs.org/search</a> before posting!<br>Please don't post (un)subscribe requests to the list. Use the <br>www interface or send it to <a href="mailto:gmx-users-request@gromacs.org" target="_blank">gmx-users-request@gromacs.org</a>.<br>
Can't post? Read <a href="http://www.gromacs.org/mailing_lists/users.php" target="_blank">http://www.gromacs.org/mailing_lists/users.php</a></div></blockquote></div><font color="#888888"><br><div>
<span style="border-collapse:separate;color:rgb(0, 0, 0);font-family:Helvetica;font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;line-height:normal;text-align:auto;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px"><span style="border-collapse:separate;color:rgb(0, 0, 0);font-family:Helvetica;font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;line-height:normal;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px"><div style="word-wrap:break-word">
<div><br>--</div><div>Dr. Carsten Kutzner</div><div>Max Planck Institute for Biophysical Chemistry</div><div>Theoretical and Computational Biophysics</div><div>Am Fassberg 11, 37077 Goettingen, Germany</div><div>Tel. +49-551-2012313, Fax: +49-551-2012302</div>
<div><a href="http://www.mpibpc.mpg.de/home/grubmueller/ihp/ckutzne" target="_blank">http://www.mpibpc.mpg.de/home/grubmueller/ihp/ckutzne</a></div><div><br></div></div><br></span><br></span>
</div>
<br></font></div><br>--<br>
gmx-users mailing list <a href="mailto:gmx-users@gromacs.org">gmx-users@gromacs.org</a><br>
<a href="http://lists.gromacs.org/mailman/listinfo/gmx-users" target="_blank">http://lists.gromacs.org/mailman/listinfo/gmx-users</a><br>
Please search the archive at <a href="http://www.gromacs.org/search" target="_blank">http://www.gromacs.org/search</a> before posting!<br>
Please don't post (un)subscribe requests to the list. Use the<br>
www interface or send it to <a href="mailto:gmx-users-request@gromacs.org">gmx-users-request@gromacs.org</a>.<br>
Can't post? Read <a href="http://www.gromacs.org/mailing_lists/users.php" target="_blank">http://www.gromacs.org/mailing_lists/users.php</a><br></blockquote></div><br><br clear="all"><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>