[gmx-developers] Only for people having pulled since Sat 9:54pm and having a strange merge conflict

Sun Jul 5 20:46:30 CEST 2009

On Sun, Jul 5, 2009 at 2:25 PM, Erik Lindahl <lindahl at cbr.su.se> wrote:

>
> On Jul 5, 2009, at 7:25 PM, Roland Schulz wrote:
>
> Hi,
>
> did you pull before?
>
>
> Erm, yes... I'm still used to cvs where that was good manner :-)
>

Something is not in sync with your local database because even the
thread_mpi complains.
The pull gives no error?  origin/master and master is in sync? You can see
that by looking at:
git diff {ref before your commit} origin/master ( commit has to be at the
tip - see below )
git status

You can make sure you have all in origin/master merged by
git merge origin/master

You can try to move your commit to the tip (anyhow good because it removes
these merge messages):
git rebase origin/master

I don't think it is related with my rebase. That should only affect
pull/merge (if you pulled between the my two pushs). But not push.

>
> Don't worry, it's not a huge commit, so I'll port it manually.
>
> BTW, is the conclusion that we should avoid rebasing?
>

No. Rebasing in your local database works great. Exspecially rebasing on the
origin/master (see above) is in my opinion even cleaner than just merge. But
even changing prior commits:
rebase -i (to squash and to edit)
rebase --onto {good-ref} {broken-ref} (to delete commits)

works great.
But doing that on already pushed commits is a bad idea.

So if one has done a mistake and already pushed than one can either:
- correct the mistake and commit the fix
- use git revert

Roland

>
>
> Cheers,
>
> Erik
>
>
>
> Roland
>
> On Sun, Jul 5, 2009 at 12:03 PM, Erik Lindahl <lindahl at cbr.su.se> wrote:
>
>> Hi Roland,
>> When I try to push I'm getting errors like:
>>
>> To git at git.gromacs.org:gromacs.git
>>  ! [rejected]        master -> master (non-fast forward)
>>  ! [rejected]        thread_mpi -> thread_mpi (non-fast forward)
>> error: failed to push some refs to 'git at git.gromacs.org<%27git at git.gromacs.org>
>> :gromacs.git'
>>
>>
>> Any clue if it could be related?
>>
>> Cheers,
>>
>> Erik
>>
>>
>> On Jul 5, 2009, at 12:23 PM, Roland Schulz wrote:
>>
>> Hi,
>>
>> if you haven't pulled from origin/master since yesterday 9:54, you won't
>> be affected by a merge problem.
>>
>> If you have. Sorry: I used rebase -i to change two commits and then pushed
>> them. I didn't know that that's a bad idea since it messes up pull/merge.
>>
>> If you working directory is clean and you have no local commits you can
>> just do:
>> git reset --hard f91e36a361ffeed4ccdad1ba4520373aa1615c8d
>> git pull
>>
>> Otherwise you can merge by hand. It's just one line. The new version is
>> correct.
>>
>> Roland
>>
>> ---------- Forwarded message ----------
>> From: <gmx-commit at gromacs.org>
>> Date: Sun, Jul 5, 2009 at 6:03 AM
>> Subject: [gmx-commit] Gromacs source branch, master, updated.
>> f51570ab8b9e746818566defff8755c56e5f2c2c
>> To: gmx-commit at gromacs.org
>>
>>
>> This is an automated email from the git hooks/post-receive script. It was
>> generated because a ref change was pushed to the repository containing
>> the project "Gromacs source".
>>
>> The branch, master has been updated
>>  discards  9430a4adcc64b1fa870dc8fa7a9d838f67c81beb (commit)
>>  discards  b404599ddd478ef3b42d0febd2bdf4a01f786e01 (commit)
>>       via  f51570ab8b9e746818566defff8755c56e5f2c2c (commit)
>>       via  b6c4bb3b6673d2255bd4f0c8cb3837e24ac9650d (commit)
>>
>> This update added new revisions after undoing existing revisions.  That is
>> to say, the old revision is not a strict subset of the new revision.  This
>> situation occurs when you --force push a change and generate a repository
>> containing something like this:
>>
>>  * -- * -- B -- O -- O -- O (9430a4adcc64b1fa870dc8fa7a9d838f67c81beb)
>>            \
>>             N -- N -- N (f51570ab8b9e746818566defff8755c56e5f2c2c)
>>
>> When this happens we assume that you've already had alert emails for all
>> of the O revisions, and so we here report only the revisions in the N
>> branch from the common base, B.
>>
>> Those revisions listed above that are new to this repository have
>> not appeared on any other notification email; so we list those
>> revisions in full, below.
>>
>> - Log -----------------------------------------------------------------
>> commit f51570ab8b9e746818566defff8755c56e5f2c2c
>> Author: Roland Schulz <rschulz at linux-ftso.site>
>> Date:   Sat Jul 4 15:40:01 2009 -0400
>>
>>    deactive by default "fexist only on master"
>>
>> commit b6c4bb3b6673d2255bd4f0c8cb3837e24ac9650d
>> Author: Roland Schulz <rschulz at linux-ftso.site>
>> Date:   Thu Jun 25 12:22:12 2009 -0400
>>
>>    added possiblility to deactivate fexist calls on non-master nodes
>>
>> -----------------------------------------------------------------------
>>
>> Summary of changes:
>>  src/kernel/md.c |    2 +-
>>  1 files changed, 1 insertions(+), 1 deletions(-)
>>
>>
>> hooks/post-receive
>> --
>> Gromacs source
>> _______________________________________________
>> gmx-commit mailing list
>> gmx-commit at gromacs.org
>> http://lists.gromacs.org/mailman/listinfo/gmx-commit
>>
>>
>>
>> --
>> ORNL/UT Center for Molecular Biophysics cmb.ornl.gov
>> 865-241-1537, ORNL PO BOX 2008 MS6309
>> _______________________________________________
>> gmx-developers mailing list
>> gmx-developers at gromacs.org
>> http://lists.gromacs.org/mailman/listinfo/gmx-developers
>> Please don't post (un)subscribe requests to the list. Use the
>> www interface or send it to gmx-developers-request at gromacs.org.
>>
>>
>>
>> _______________________________________________
>> gmx-developers mailing list
>> gmx-developers at gromacs.org
>> http://lists.gromacs.org/mailman/listinfo/gmx-developers
>> Please don't post (un)subscribe requests to the list. Use the
>> www interface or send it to gmx-developers-request at gromacs.org.
>>
>
>
>
> --
> ORNL/UT Center for Molecular Biophysics cmb.ornl.gov
> 865-241-1537, ORNL PO BOX 2008 MS6309
> _______________________________________________
> gmx-developers mailing list
> gmx-developers at gromacs.org
> http://lists.gromacs.org/mailman/listinfo/gmx-developers
> Please don't post (un)subscribe requests to the list. Use the
> www interface or send it to gmx-developers-request at gromacs.org.
>
>
>
> _______________________________________________
> gmx-developers mailing list
> gmx-developers at gromacs.org
> http://lists.gromacs.org/mailman/listinfo/gmx-developers
> Please don't post (un)subscribe requests to the list. Use the
> www interface or send it to gmx-developers-request at gromacs.org.
>

-- 
ORNL/UT Center for Molecular Biophysics cmb.ornl.gov
865-241-1537, ORNL PO BOX 2008 MS6309
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://maillist.sys.kth.se/pipermail/gromacs.org_gmx-developers/attachments/20090705/4aa6bac6/attachment.html>