Hi,<br><br>if you haven't pulled from origin/master since yesterday 9:54, you won't be affected by a merge problem.<br><br>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.<br>
<br>If you working directory is clean and you have no local commits you can just do:<br>git reset --hard f91e36a361ffeed4ccdad1ba4520373aa1615c8d<br>git pull<br><br>Otherwise you can merge by hand. It's just one line. The new version is correct.<br>
<br>Roland<br><br><div class="gmail_quote">---------- Forwarded message ----------<br>From: <b class="gmail_sendername"></b> <span dir="ltr"><<a href="mailto:gmx-commit@gromacs.org">gmx-commit@gromacs.org</a>></span><br>
Date: Sun, Jul 5, 2009 at 6:03 AM<br>Subject: [gmx-commit] Gromacs source branch, master, updated. f51570ab8b9e746818566defff8755c56e5f2c2c<br>To: <a href="mailto:gmx-commit@gromacs.org">gmx-commit@gromacs.org</a><br><br>
<br>This is an automated email from the git hooks/post-receive script. It was<br>
generated because a ref change was pushed to the repository containing<br>
the project "Gromacs source".<br>
<br>
The branch, master has been updated<br>
discards 9430a4adcc64b1fa870dc8fa7a9d838f67c81beb (commit)<br>
discards b404599ddd478ef3b42d0febd2bdf4a01f786e01 (commit)<br>
via f51570ab8b9e746818566defff8755c56e5f2c2c (commit)<br>
via b6c4bb3b6673d2255bd4f0c8cb3837e24ac9650d (commit)<br>
<br>
This update added new revisions after undoing existing revisions. That is<br>
to say, the old revision is not a strict subset of the new revision. This<br>
situation occurs when you --force push a change and generate a repository<br>
containing something like this:<br>
<br>
* -- * -- B -- O -- O -- O (9430a4adcc64b1fa870dc8fa7a9d838f67c81beb)<br>
\<br>
N -- N -- N (f51570ab8b9e746818566defff8755c56e5f2c2c)<br>
<br>
When this happens we assume that you've already had alert emails for all<br>
of the O revisions, and so we here report only the revisions in the N<br>
branch from the common base, B.<br>
<br>
Those revisions listed above that are new to this repository have<br>
not appeared on any other notification email; so we list those<br>
revisions in full, below.<br>
<br>
- Log -----------------------------------------------------------------<br>
commit f51570ab8b9e746818566defff8755c56e5f2c2c<br>
Author: Roland Schulz <rschulz@linux-ftso.site><br>
Date: Sat Jul 4 15:40:01 2009 -0400<br>
<br>
deactive by default "fexist only on master"<br>
<br>
commit b6c4bb3b6673d2255bd4f0c8cb3837e24ac9650d<br>
Author: Roland Schulz <rschulz@linux-ftso.site><br>
Date: Thu Jun 25 12:22:12 2009 -0400<br>
<br>
added possiblility to deactivate fexist calls on non-master nodes<br>
<br>
-----------------------------------------------------------------------<br>
<br>
Summary of changes:<br>
src/kernel/md.c | 2 +-<br>
1 files changed, 1 insertions(+), 1 deletions(-)<br>
<br>
<br>
hooks/post-receive<br>
<font color="#888888">--<br>
Gromacs source<br>
_______________________________________________<br>
gmx-commit mailing list<br>
<a href="mailto:gmx-commit@gromacs.org">gmx-commit@gromacs.org</a><br>
<a href="http://lists.gromacs.org/mailman/listinfo/gmx-commit" target="_blank">http://lists.gromacs.org/mailman/listinfo/gmx-commit</a><br>
</font></div><br><br clear="all"><br>-- <br>ORNL/UT Center for Molecular Biophysics <a href="http://cmb.ornl.gov">cmb.ornl.gov</a><br>865-241-1537, ORNL PO BOX 2008 MS6309<br>