[Bioperl-l] Regarding git commits...

[Chris Fields]

Yes.  The general syntax is:

git pull <repo> <to-branch> 

If you have a read-write checkout directly from bioperl/bioperl-live.git, 'origin' should be set to that, and if you are on the a specific branch a simple 'git pull' will work (it implies 'git pull origin <branch>').  All collabs can do this.  

In the case of a forked repo (which anyone can do), it's a little trickier as it's essentially a branch from the repository at a specific point; it isn't automatically synced.  You can see that here:

http://github.com/bioperl/bioperl-live/network

In order to sync with the original repo, you need to specify exactly which remote to pull from, likely not 'origin' (which is your forked repo), but 'upstream' or whatever you set the original bioperl read-only repo to via:

git remote add upstream git://github.com/bioperl/bioperl-live.git

Then, to sync, do:

git pull upstream master
git push # goes to your forked repo

chris

PS - Note on the graph linked to I just synced my branch using the above.  

On May 20, 2010, at 11:58 AM, Jason Stajich wrote:

> I think you want
> $ git pull upstream master
> 
> http://help.github.com/forking/
> 
> Florent Angly wrote, On 5/20/10 9:22 AM:
>> On 20/05/10 09:05, Chris Fields wrote:
>>> All,
>>> 
>>> Please make sure to update your local git repos prior to doing commits 
>> That's done with "git pull", as mentioned on the wiki (http://www.bioperl.org/wiki/Using_Git), right?
>> 
>>> and pushing to master, and merge commits in properly if they don't match.  Please please please don't save over files if they don't merge correctly.  I just found out I had a prior commit that fixed the test number and removed old files that was completely clobbered, so I'm having to hand-merge those changes back in now.  If it were anything more involved I would revert that prior commit completely.
>>> 
>>> chris
>>> _______________________________________________
>>> Bioperl-l mailing list
>>> Bioperl-l at lists.open-bio.org
>>> http://lists.open-bio.org/mailman/listinfo/bioperl-l 
>> 
>> _______________________________________________
>> Bioperl-l mailing list
>> Bioperl-l at lists.open-bio.org
>> http://lists.open-bio.org/mailman/listinfo/bioperl-l 
> _______________________________________________
> Bioperl-l mailing list
> Bioperl-l at lists.open-bio.org
> http://lists.open-bio.org/mailman/listinfo/bioperl-l