Dear Bioc devel, I am having issues pushing code to the latest release. I currently have the following branches
-> % git branch -a * RELEASE_3_5 master remotes/origin/HEAD -> origin/master remotes/origin/RELEASE_3_5 remotes/origin/master remotes/upstream/RELEASE_2_14 remotes/upstream/RELEASE_3_0 remotes/upstream/RELEASE_3_1 remotes/upstream/RELEASE_3_2 remotes/upstream/RELEASE_3_3 remotes/upstream/RELEASE_3_4 remotes/upstream/RELEASE_3_5 remotes/upstream/master My current branch is a local copy of upstreams/RELEASE_3_5, freshly created with git checkout -b RELEASE_3_5 upstream/RELEASE_3_5 I can push my local changes to github with git push origin RELEASE_3_5 but can't to the Bioc git server -> % git push upstream RELEASE_3_5 Counting objects: 43, done. Delta compression using up to 4 threads. Compressing objects: 100% (6/6), done. Writing objects: 100% (7/7), 633 bytes | 0 bytes/s, done. Total 7 (delta 4), 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@r-project.org>. Provide the error, the package name and remote: any other details we might need. remote: remote: Use remote: remote: git show cd9660b1dab49df98cf3b5b36635d0b6956be832 remote: git show 7670203afb2548072d96667e3677a93b3917a547 remote: remote: to see body of commits. remote: To g...@git.bioconductor.org:packages/rpx.git ! [remote rejected] RELEASE_3_5 -> RELEASE_3_5 (pre-receive hook declined) error: failed to push some refs to 'g...@git.bioconductor.org:packages/rpx.git But there aren't any duplicated commits, as far as I can see lg390@elyacin [09:22:03] [~/dev/rpx] [RELEASE_3_5] -> % git log --oneline | wc 59 471 3040 lg390@elyacin [09:22:24] [~/dev/rpx] [RELEASE_3_5] -> % git log --oneline | sort | uniq| wc 59 471 3040 Note that a similar procedure to push to upstream/master works. Any help greatly appreciated. Laurent -- Laurent Gatto | @lgatt0 http://cpu.sysbiol.cam.ac.uk/ http://lgatto.github.io/ _______________________________________________ Bioc-devel@r-project.org mailing list https://stat.ethz.ch/mailman/listinfo/bioc-devel
