[gmx-developers] gromacs.org_gmx-developers Digest, Vol 148, Issue 14

[Mohammad Ghahremanpour]

Hi,

Yes, I have a merge in my history based on the git log.

commit 45a8d8207f9c807efb5c9c655404cf94bb96627a

Merge: 345f7de a13273d

Author: mohammad-ghahremanpour <ghahremanpour.gro at gmail.com>

Date:   Thu Aug 18 07:43:36 2016 +0200


    conflicts is removed



    Change-Id: If72e07d3545b109f48b91a6aeff3063a3b9e464e


Cheers,

Mohammad

On Sat, Aug 27, 2016 at 12:00 PM, <
gromacs.org_gmx-developers-request at maillist.sys.kth.se> wrote:

> Send gromacs.org_gmx-developers mailing list submissions to
>         gromacs.org_gmx-developers at maillist.sys.kth.se
>
> To subscribe or unsubscribe via the World Wide Web, visit
>         https://maillist.sys.kth.se/mailman/listinfo/gromacs.org_
> gmx-developers
>
> or, via email, send a message with subject or body 'help' to
>         gromacs.org_gmx-developers-request at maillist.sys.kth.se
>
> You can reach the person managing the list at
>         gromacs.org_gmx-developers-owner at maillist.sys.kth.se
>
> When replying, please edit your Subject line so it is more specific
> than "Re: Contents of gromacs.org_gmx-developers digest..."
>
>
> Today's Topics:
>
>    1. Problem with git push (Mohammad Ghahremanpour)
>    2. Re: Problem with git push (Schulz, Roland)
>
>
> ----------------------------------------------------------------------
>
> Message: 1
> Date: Fri, 26 Aug 2016 14:45:05 +0200
> From: Mohammad Ghahremanpour <ghahremanpour.gro at gmail.com>
> To: gromacs.org_gmx-developers at maillist.sys.kth.se
> Subject: [gmx-developers] Problem with git push
> Message-ID:
>         <CADNd5+bA7DsHLP72X5YhLHhJW96UDTHCOJHO
> +J8oE0+0dw1Hqw at mail.gmail.com>
> Content-Type: text/plain; charset="utf-8"
>
> Hello,
>
> 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.
>
> 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.
>
> This is the error message I got
>
> Counting objects: 87, done.
>
> Delta compression using up to 4 threads.
>
> Compressing objects: 100% (87/87), done.
>
> Writing objects: 100% (87/87), 12.19 KiB | 0 bytes/s, done.
>
> Total 87 (delta 76), reused 0 (delta 0)
>
> remote: Resolving deltas: 100% (76/76)
>
> remote: Processing changes: refs: 1, done
>
> To ssh://mohammad-ghahremanpour@gerrit.gromacs.org:29418/gromacs.git
>
>  ! [remote rejected] alexandria -> alexandria (you are not allowed to
> upload merges)
>
> error: failed to push some refs to 'ssh://
> mohammad-ghahremanpour at gerrit.gromacs.org:29418/gromacs.git'
>
> Cheers,
> Mohammad
> -------------- next part --------------
> An HTML attachment was scrubbed...
> URL: <http://maillist.sys.kth.se/pipermail/gromacs.org_gmx-
> developers/attachments/20160826/0c6977c8/attachment-0001.html>
>
> ------------------------------
>
> Message: 2
> Date: Fri, 26 Aug 2016 23:18:41 +0000
> From: "Schulz, Roland" <roland.schulz at intel.com>
> To: "gmx-developers at gromacs.org" <gmx-developers at gromacs.org>
> Subject: Re: [gmx-developers] Problem with git push
> Message-ID:
>         <BF759D1B2ACA754496CB1E61835C71EA3FE561 at ORSMSX109.amr.corp.
> intel.com>
> Content-Type: text/plain; charset="utf-8"
>
> Hi,
>
> 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.
>
> Roland
>
> From: gromacs.org_gmx-developers-bounces at maillist.sys.kth.se [mailto:
> gromacs.org_gmx-developers-bounces at maillist.sys.kth.se] On Behalf Of
> Mohammad Ghahremanpour
> Sent: Friday, August 26, 2016 5:45 AM
> To: gromacs.org_gmx-developers at maillist.sys.kth.se
> Subject: [gmx-developers] Problem with git push
>
> Hello,
>
> 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.
>
> 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.
>
> This is the error message I got
>
>
> Counting objects: 87, done.
>
> Delta compression using up to 4 threads.
>
> Compressing objects: 100% (87/87), done.
>
> Writing objects: 100% (87/87), 12.19 KiB | 0 bytes/s, done.
>
> Total 87 (delta 76), reused 0 (delta 0)
>
> remote: Resolving deltas: 100% (76/76)
>
> remote: Processing changes: refs: 1, done
>
> To ssh://mohammad-ghahremanpour@gerrit.gromacs.org:29418/gromacs.git<
> http://mohammad-ghahremanpour@gerrit.gromacs.org:29418/gromacs.git>
>
>  ! [remote rejected] alexandria -> alexandria (you are not allowed to
> upload merges)
>
> error: failed to push some refs to 'ssh://mohammad-ghahremanpour@
> gerrit.gromacs.org:29418/gromacs.git<http://mohammad-
> ghahremanpour at gerrit.gromacs.org:29418/gromacs.git>'
>
> Cheers,
> Mohammad
>
>
> -------------- next part --------------
> An HTML attachment was scrubbed...
> URL: <http://maillist.sys.kth.se/pipermail/gromacs.org_gmx-
> developers/attachments/20160826/75385e09/attachment-0001.html>
>
> ------------------------------
>
> --
> Gromacs Developers mailing list
>
> * Please search the archive at http://www.gromacs.org/
> Support/Mailing_Lists/GMX-developers_List before posting!
>
> * Can't post? Read http://www.gromacs.org/Support/Mailing_Lists
>
> * For (un)subscribe requests visit
> https://maillist.sys.kth.se/mailman/listinfo/gromacs.org_gmx-developers
> or send a mail to gmx-developers-request at gromacs.org.
>
> End of gromacs.org_gmx-developers Digest, Vol 148, Issue 14
> ***********************************************************
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://maillist.sys.kth.se/pipermail/gromacs.org_gmx-developers/attachments/20160827/49eacd02/attachment.html>