[Bioperl-l] Regarding git commits...

[Chris Fields]

It should, yes, and it is a nice selling point.  But you can update local or set up a new clone from remote, then save over any changes with a backup copy from an old (non-merged) version, then commit.  That's something that can happen in any VCS.

chris

On May 20, 2010, at 1:06 PM, Jay Hannah wrote:

> On May 20, 2010, at 11:05 AM, Chris Fields wrote:
>> Please make sure to update your local git repos prior to doing commits and pushing to master
> 
> I thought git refused to push if your local was out of date? (I thought this was one of the general selling points of git?)  It seems to be doing that to me, below.
> 
> Jay Hannah
> http://biodoc.ist.unomaha.edu/wiki/User:Jhannah
> 
> 
> jhannah at jaysnet-MacBook:~/src/sandbox$ git push
> To git at github.com:jhannah/sandbox.git
> ! [rejected]        master -> master (non-fast-forward)
> error: failed to push some refs to 'git at github.com:jhannah/sandbox.git'
> To prevent you from losing history, non-fast-forward updates were rejected
> Merge the remote changes before pushing again.  See the 'Note about
> fast-forwards' section of 'git push --help' for details.
>