<div dir="ltr">Hi, <div><br></div><div>Yes, I have a merge in my history based on the git log. </div><div><br></div><div><p style="margin:0px;font-size:13px;line-height:normal;font-family:Menlo;color:rgb(175,173,36)"><span style="">commit 45a8d8207f9c807efb5c9c655404cf94bb96627a</span></p>
<p style="margin:0px;font-size:13px;line-height:normal;font-family:Menlo"><span style="">Merge: 345f7de a13273d</span></p>
<p style="margin:0px;font-size:13px;line-height:normal;font-family:Menlo"><span style="">Author: mohammad-ghahremanpour <<a href="mailto:ghahremanpour.gro@gmail.com">ghahremanpour.gro@gmail.com</a>></span></p>
<p style="margin:0px;font-size:13px;line-height:normal;font-family:Menlo"><span style="">Date: Thu Aug 18 07:43:36 2016 +0200</span></p>
<p style="margin:0px;font-size:13px;line-height:normal;font-family:Menlo;min-height:15px"><span style=""></span><br></p>
<p style="margin:0px;font-size:13px;line-height:normal;font-family:Menlo"><span style=""> conflicts is removed</span></p>
<p style="margin:0px;font-size:13px;line-height:normal;font-family:Menlo;min-height:15px"><span style=""> </span></p>
<p style="margin:0px;font-size:13px;line-height:normal;font-family:Menlo"><span style=""> Change-Id: If72e07d3545b109f48b91a6aeff3063a3b9e464e</span></p><p style="margin:0px;font-size:13px;line-height:normal;font-family:Menlo"><span style=""><br></span></p><p style="margin:0px;font-size:13px;line-height:normal;font-family:Menlo"><span style="">Cheers,</span></p><p style="margin:0px;font-size:13px;line-height:normal;font-family:Menlo"><span style="">Mohammad</span></p></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Sat, Aug 27, 2016 at 12:00 PM, <span dir="ltr"><<a href="mailto:gromacs.org_gmx-developers-request@maillist.sys.kth.se" target="_blank">gromacs.org_gmx-developers-request@maillist.sys.kth.se</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Send gromacs.org_gmx-developers mailing list submissions to<br>
<a href="mailto:gromacs.org_gmx-developers@maillist.sys.kth.se">gromacs.org_gmx-developers@<wbr>maillist.sys.kth.se</a><br>
<br>
To subscribe or unsubscribe via the World Wide Web, visit<br>
<a href="https://maillist.sys.kth.se/mailman/listinfo/gromacs.org_gmx-developers" rel="noreferrer" target="_blank">https://maillist.sys.kth.se/<wbr>mailman/listinfo/gromacs.org_<wbr>gmx-developers</a><br>
<br>
or, via email, send a message with subject or body 'help' to<br>
<a href="mailto:gromacs.org_gmx-developers-request@maillist.sys.kth.se">gromacs.org_gmx-developers-<wbr>request@maillist.sys.kth.se</a><br>
<br>
You can reach the person managing the list at<br>
<a href="mailto:gromacs.org_gmx-developers-owner@maillist.sys.kth.se">gromacs.org_gmx-developers-<wbr>owner@maillist.sys.kth.se</a><br>
<br>
When replying, please edit your Subject line so it is more specific<br>
than "Re: Contents of gromacs.org_gmx-developers digest..."<br>
<br>
<br>
Today's Topics:<br>
<br>
1. Problem with git push (Mohammad Ghahremanpour)<br>
2. Re: Problem with git push (Schulz, Roland)<br>
<br>
<br>
------------------------------<wbr>------------------------------<wbr>----------<br>
<br>
Message: 1<br>
Date: Fri, 26 Aug 2016 14:45:05 +0200<br>
From: Mohammad Ghahremanpour <<a href="mailto:ghahremanpour.gro@gmail.com">ghahremanpour.gro@gmail.com</a>><br>
To: <a href="mailto:gromacs.org_gmx-developers@maillist.sys.kth.se">gromacs.org_gmx-developers@<wbr>maillist.sys.kth.se</a><br>
Subject: [gmx-developers] Problem with git push<br>
Message-ID:<br>
<<a href="mailto:CADNd5%2BbA7DsHLP72X5YhLHhJW96UDTHCOJHO%2BJ8oE0%2B0dw1Hqw@mail.gmail.com">CADNd5+<wbr>bA7DsHLP72X5YhLHhJW96UDTHCOJHO<wbr>+J8oE0+0dw1Hqw@mail.gmail.com</a>><br>
Content-Type: text/plain; charset="utf-8"<br>
<br>
Hello,<br>
<br>
I am coding for the Alexandria branch have a problem to git push after<br>
almost every couple of weeks. If I clone a fresh repository, then I can git<br>
push but after a few weeks it does not work again.<br>
<br>
I have solved the problem a few times by cloning a fresh repository.<br>
However, I would wonder if you could help me solve the problem.<br>
<br>
This is the error message I got<br>
<br>
Counting objects: 87, done.<br>
<br>
Delta compression using up to 4 threads.<br>
<br>
Compressing objects: 100% (87/87), done.<br>
<br>
Writing objects: 100% (87/87), 12.19 KiB | 0 bytes/s, done.<br>
<br>
Total 87 (delta 76), reused 0 (delta 0)<br>
<br>
remote: Resolving deltas: 100% (76/76)<br>
<br>
remote: Processing changes: refs: 1, done<br>
<br>
To ssh://<a href="http://mohammad-ghahremanpour@gerrit.gromacs.org:29418/gromacs.git" rel="noreferrer" target="_blank">mohammad-ghahremanpour@<wbr>gerrit.gromacs.org:29418/<wbr>gromacs.git</a><br>
<br>
! [remote rejected] alexandria -> alexandria (you are not allowed to<br>
upload merges)<br>
<br>
error: failed to push some refs to 'ssh://<br>
<a href="http://mohammad-ghahremanpour@gerrit.gromacs.org:29418/gromacs.git" rel="noreferrer" target="_blank">mohammad-ghahremanpour@gerrit.<wbr>gromacs.org:29418/gromacs.git</a>'<br>
<br>
Cheers,<br>
Mohammad<br>
-------------- next part --------------<br>
An HTML attachment was scrubbed...<br>
URL: <<a href="http://maillist.sys.kth.se/pipermail/gromacs.org_gmx-developers/attachments/20160826/0c6977c8/attachment-0001.html" rel="noreferrer" target="_blank">http://maillist.sys.kth.se/<wbr>pipermail/gromacs.org_gmx-<wbr>developers/attachments/<wbr>20160826/0c6977c8/attachment-<wbr>0001.html</a>><br>
<br>
------------------------------<br>
<br>
Message: 2<br>
Date: Fri, 26 Aug 2016 23:18:41 +0000<br>
From: "Schulz, Roland" <<a href="mailto:roland.schulz@intel.com">roland.schulz@intel.com</a>><br>
To: "<a href="mailto:gmx-developers@gromacs.org">gmx-developers@gromacs.org</a>" <<a href="mailto:gmx-developers@gromacs.org">gmx-developers@gromacs.org</a>><br>
Subject: Re: [gmx-developers] Problem with git push<br>
Message-ID:<br>
<<a href="mailto:BF759D1B2ACA754496CB1E61835C71EA3FE561@ORSMSX109.amr.corp.intel.com">BF759D1B2ACA754496CB1E61835C7<wbr>1EA3FE561@ORSMSX109.amr.corp.<wbr>intel.com</a>><br>
Content-Type: text/plain; charset="utf-8"<br>
<br>
Hi,<br>
<br>
Make sure you don?t have any merge commits in your history (if you run ?git log? you shoudn?t see any Merge:). Then try to push again.<br>
<br>
Roland<br>
<br>
From: <a href="mailto:gromacs.org_gmx-developers-bounces@maillist.sys.kth.se">gromacs.org_gmx-developers-<wbr>bounces@maillist.sys.kth.se</a> [mailto:<a href="mailto:gromacs.org_gmx-developers-bounces@maillist.sys.kth.se">gromacs.org_gmx-<wbr>developers-bounces@maillist.<wbr>sys.kth.se</a>] On Behalf Of Mohammad Ghahremanpour<br>
Sent: Friday, August 26, 2016 5:45 AM<br>
To: <a href="mailto:gromacs.org_gmx-developers@maillist.sys.kth.se">gromacs.org_gmx-developers@<wbr>maillist.sys.kth.se</a><br>
Subject: [gmx-developers] Problem with git push<br>
<br>
Hello,<br>
<br>
I am coding for the Alexandria branch have a problem to git push after almost every couple of weeks. If I clone a fresh repository, then I can git push but after a few weeks it does not work again.<br>
<br>
I have solved the problem a few times by cloning a fresh repository. However, I would wonder if you could help me solve the problem.<br>
<br>
This is the error message I got<br>
<br>
<br>
Counting objects: 87, done.<br>
<br>
Delta compression using up to 4 threads.<br>
<br>
Compressing objects: 100% (87/87), done.<br>
<br>
Writing objects: 100% (87/87), 12.19 KiB | 0 bytes/s, done.<br>
<br>
Total 87 (delta 76), reused 0 (delta 0)<br>
<br>
remote: Resolving deltas: 100% (76/76)<br>
<br>
remote: Processing changes: refs: 1, done<br>
<br>
To ssh://<a href="http://mohammad-ghahremanpour@gerrit.gromacs.org:29418/gromacs.git" rel="noreferrer" target="_blank">mohammad-ghahremanpour@<wbr>gerrit.gromacs.org:29418/<wbr>gromacs.git</a><<a href="http://mohammad-ghahremanpour@gerrit.gromacs.org:29418/gromacs.git" rel="noreferrer" target="_blank">http://mohammad-<wbr>ghahremanpour@gerrit.gromacs.<wbr>org:29418/gromacs.git</a>><br>
<br>
! [remote rejected] alexandria -> alexandria (you are not allowed to upload merges)<br>
<br>
error: failed to push some refs to 'ssh://<a href="http://mohammad-ghahremanpour@gerrit.gromacs.org:29418/gromacs.git" rel="noreferrer" target="_blank">mohammad-ghahremanpour@<wbr>gerrit.gromacs.org:29418/<wbr>gromacs.git</a><<a href="http://mohammad-ghahremanpour@gerrit.gromacs.org:29418/gromacs.git" rel="noreferrer" target="_blank">http://mohammad-<wbr>ghahremanpour@gerrit.gromacs.<wbr>org:29418/gromacs.git</a>>'<br>
<br>
Cheers,<br>
Mohammad<br>
<br>
<br>
-------------- next part --------------<br>
An HTML attachment was scrubbed...<br>
URL: <<a href="http://maillist.sys.kth.se/pipermail/gromacs.org_gmx-developers/attachments/20160826/75385e09/attachment-0001.html" rel="noreferrer" target="_blank">http://maillist.sys.kth.se/<wbr>pipermail/gromacs.org_gmx-<wbr>developers/attachments/<wbr>20160826/75385e09/attachment-<wbr>0001.html</a>><br>
<br>
------------------------------<br>
<span class="HOEnZb"><font color="#888888"><br>
--<br>
Gromacs Developers mailing list<br>
<br>
* Please search the archive at <a href="http://www.gromacs.org/Support/Mailing_Lists/GMX-developers_List" rel="noreferrer" target="_blank">http://www.gromacs.org/<wbr>Support/Mailing_Lists/GMX-<wbr>developers_List</a> before posting!<br>
<br>
* Can't post? Read <a href="http://www.gromacs.org/Support/Mailing_Lists" rel="noreferrer" target="_blank">http://www.gromacs.org/<wbr>Support/Mailing_Lists</a><br>
<br>
* For (un)subscribe requests visit<br>
<a href="https://maillist.sys.kth.se/mailman/listinfo/gromacs.org_gmx-developers" rel="noreferrer" target="_blank">https://maillist.sys.kth.se/<wbr>mailman/listinfo/gromacs.org_<wbr>gmx-developers</a> or send a mail to <a href="mailto:gmx-developers-request@gromacs.org">gmx-developers-request@<wbr>gromacs.org</a>.<br>
<br>
End of gromacs.org_gmx-developers Digest, Vol 148, Issue 14<br>
******************************<wbr>*****************************<br>
</font></span></blockquote></div><br></div>