[gmx-developers] Problem with git push

[Schulz, Roland]

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@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.html>