On Sep 7, 2017, at 7:04 PM, Thomas Girke <thomas.girke at ucr.edu> wrote:
Dear Nitesh,
In the release branch of our ChemmineR package I am getting a duplicate commit error. Last week we had a similar error across several of our packages but then you made some changes in response to a similar problem reported on the bioc-developer site which eliminated the problem by itself. Now the problem is back again and it is not clear to me how to resolve it. The suggestions given here https://goo.gl/5mk8vV sound a bit harsh.
tgirke at tgirke-XPS-13-9343
:~/Dropbox/Software/ChemmineR/ChemmineR$ git push upstream RELEASE_3_5
Counting objects:
26
, done.
Delta compression using up to
4
threads.
Compressing objects:
100% (4/4
), done.
Writing objects:
100% (4/4), 387 bytes | 0
bytes/s, done.
Total
4 (delta 3), 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 8210e1e04e8dc6819b84820077293d8d61914cf5
remote: git show f514d35b793e1d9462b899bf3c76cc06ab4dcc91
remote:
remote: to see body of commits.
remote:
To git at git.bioconductor.org:packages/ChemmineR.git
! [remote rejected] RELEASE_3_5 -> RELEASE_3_5 (pre-receive hook declined)
error: failed to push some refs to
'git at git.bioconductor.org:packages/ChemmineR.git'
Thanks,
Thomas
--
Thomas Girke, Ph.D.
Professor of Bioinformatics
Director of HPC Center
1207F Genomics Building
University of California
Riverside, CA 92521
E-mail: thomas.girke at ucr.edu
Phone/Cell/Text: 951-732-7072