[Bioc-devel] "Error: duplicate commits" when pushing FamAgg to Bioconductor git

[Rainer Johannes]

Dear all,

I'm unable to push my recent changes to FamAgg to the Bioconductor git repo (see below for the error message). I did try the suggested fix but without any success - seems the duplicated commits are in Bioconductor and not github.

thankful for any help or advise

The error message is:

macbookjo:FamAgg jo$ git push origin master
Everything up-to-date
macbookjo:FamAgg jo$ git push upstream master
Counting objects: 13, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (13/13), done.
Writing objects: 100% (13/13), 2.17 KiB | 2.17 MiB/s, done.
Total 13 (delta 11), reused 0 (delta 0)
remote: Error: duplicate commits.
remote: 
remote: There are duplicate commits in your commit history, These cannot be
remote: pushed to the Bioconductor git server. Please make sure that this is
remote: resolved.
remote: 
remote: Take a look at the documentation to fix this,
remote: https://bioconductor.org/developers/how-to/git/sync-existing-repositories/,
remote: particularly, point #8 (force Bioconductor master to Github master).
remote: 
remote: For more information, or help resolving this issue, contact
remote: <bioc-devel at r-project.org>. Provide the error, the package name and
remote: any other details we might need.
remote: 
remote: Use
remote: 
remote:     git show 397d05e8ba7d301a9145573210c277f1c6dd66a5
remote:     git show 6a0c683477b78e231a7eb1b59171baa0bc582ef2
remote: 
remote: to see body of commits.
remote: 
To git.bioconductor.org:packages/FamAgg
 ! [remote rejected] master -> master (pre-receive hook declined)
error: failed to push some refs to 'git at git.bioconductor.org:packages/FamAgg'


macbookjo:FamAgg jo$ git show 397d05e8ba7d301a9145573210c277f1c6dd66a5
commit 397d05e8ba7d301a9145573210c277f1c6dd66a5
Author: Herve Pages <hpages at fhcrc.org>
Date:   Mon Apr 24 19:50:57 2017 +0000

    bump x.y.z versions to odd y after creation of 3_5 branch
    
    git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/FamAgg@129129 bc3139a8-67e5-0310-9ffc-ced21a209358

diff --git a/DESCRIPTION b/DESCRIPTION
index c9cb1b7..948b777 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: FamAgg
 Type: Package
 Title: Pedigree Analysis and Familial Aggregation
-Version: 1.4.0
+Version: 1.5.0
 Author: J. Rainer, D. Taliun, C.X. Weichenberger
 Maintainer: Johannes Rainer <johannes.rainer at eurac.edu>
 URL: https://github.com/jotsetung/FamAgg

macbookjo:FamAgg jo$ git show 6a0c683477b78e231a7eb1b59171baa0bc582ef2
commit 6a0c683477b78e231a7eb1b59171baa0bc582ef2
Author: hpages at fhcrc.org <hpages at fhcrc.org@bc3139a8-67e5-0310-9ffc-ced21a209358>
Date:   Mon Apr 24 19:50:57 2017 +0000

    bump x.y.z versions to odd y after creation of 3_5 branch
    
    git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/FamAgg@129129 bc3139a8-67e5-0310-9ffc-ced21a209358

diff --git a/DESCRIPTION b/DESCRIPTION
index c9cb1b7..948b777 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: FamAgg
 Type: Package
 Title: Pedigree Analysis and Familial Aggregation
-Version: 1.4.0
+Version: 1.5.0
 Author: J. Rainer, D. Taliun, C.X. Weichenberger
 Maintainer: Johannes Rainer <johannes.rainer at eurac.edu>
 URL: https://github.com/jotsetung/FamAgg