[gmx-users] help with git
Alan
alanwilter at gmail.com
Tue Aug 24 16:09:06 CEST 2010
Sorry if confused... because I am *really* confused too with git.
Anyway, I started anew again and it seems to be working now.
So I clone gmx:
git clone git://git.gromacs.org/gromacs.git
cd gromacs
git branch
* master
git pull
Already up-to-date.
# now I want to move to 'release-4-5-patch' branch
git checkout -t origin/release-4-5-patches
Branch release-4-5-patches set up to track remote branch release-4-5-patches
from origin.
Switched to a new branch 'release-4-5-patches'
git branch
master
* release-4-5-patches
git pull
Already up-to-date.
# now I want to go back to master
git checkout -t origin/master
fatal: git checkout: branch master already exists
git branch
master
* release-4-5-patches
# didn't change, let's try another command (and here starts my 'guessing'
experiment)
git checkout master
Switched to branch 'master'
# nice it works!
Thanks,
Alan
On 24 August 2010 14:14, Roland Schulz <roland at utk.edu> wrote:
>
>
> On Tue, Aug 24, 2010 at 9:01 AM, Alan <alanwilter at gmail.com> wrote:
>
>> Ok, doing:
>>
>> git reset origin/release-4-5-patches
>> git checkout origin/release-4-5-patches
>>
> I'm confused what you are trying to do. But you are not supposed to
> checkout a remote branch.
>
>> git pull
>> Already up-to-date.
>>
>> restored the sanity of system.
>>
>> On 24 August 2010 13:52, Alan <alanwilter at gmail.com> wrote:
>>
>>> 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 <ckutzne at gwdg.de> 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 gmx-users at gromacs.org
>>>> 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 gmx-users-request at gromacs.org.
>>>> 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 gmx-users at gromacs.org
>>>> 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 gmx-users-request at gromacs.org.
>>>> 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<<
>>>
>>
>>
>>
>> --
>> 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 gmx-users at gromacs.org
>> 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 gmx-users-request at gromacs.org.
>> Can't post? Read http://www.gromacs.org/mailing_lists/users.php
>>
>
>
>
> --
> ORNL/UT Center for Molecular Biophysics cmb.ornl.gov
> 865-241-1537, ORNL PO BOX 2008 MS6309
>
> --
> gmx-users mailing list gmx-users at gromacs.org
> 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 gmx-users-request at gromacs.org.
> 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<<
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://maillist.sys.kth.se/pipermail/gromacs.org_gmx-users/attachments/20100824/e57b8a66/attachment.html>
More information about the gromacs.org_gmx-users
mailing list