[Bioperl-l] Regarding git commits...

[Chris Fields]

On May 20, 2010, at 2:09 PM, Jay Hannah wrote:

> On May 20, 2010, at 1:43 PM, Chris Fields wrote:
>> 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.
> 
> So... you're saying don't commit if you don't have any idea what you're committing?  :)
> 
> git pull
> git diff
> git status
> if local is clean then
>   -edit-
>   git diff     if it looks good then   git commit
>   git status   if it looks good then   git push
> 
> Jay Hannah
> http://biodoc.ist.unomaha.edu/wiki/User:Jhannah
> enjoys preaching to the choir   ;)

Maybe the point is, if someone is having a problem with git either pulling from or pushing to the remote repo, it's very likely b/c of a merge conflict (git is trying to tell you something). There are lots of ways to resolve those (most easily by hand if the change is small).  But saving over the top of someone else's commit in a re-cloned repo is definitely not one of them.

Possibly a section of 'Using git' that needs some work?

chris