[Bioc-devel] Duplicate commit error when pushing to annotatr upstream/master

[Raymond Cavalcante]

Hello,

I’m running into the following error when trying to push some changes to annotatr upstream/master:

> rcavalca$ git push upstream master
> Counting objects: 6, done.
> Delta compression using up to 8 threads.
> Compressing objects: 100% (6/6), done.
> Writing objects: 100% (6/6), 854 bytes | 854.00 KiB/s, done.
> Total 6 (delta 5), 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 ffdb09d480c01535466e89b99e22535672e362a7
> remote:     git show 333da75f93af1ca7f5cb9a8443a1d5c963f21280
> remote: 
> remote: to see body of commits.
> remote: 
> To git.bioconductor.org:packages/annotatr.git
>  ! [remote rejected] master -> master (pre-receive hook declined)
> error: failed to push some refs to 'git at git.bioconductor.org:packages/annotatr.git'


The two commits that are highlighted in the error message are "bump x.y.z versions to odd y after creation of 3_5 branch" commits. I was always confused about the git-svn bridge, but these twin commits are an artifact of that system, I think. The commit that I was trying to push to upstream/master is unrelated to those two commits, and I have committed other items in the new git way prior to the 3.6 release with no issue.

I tried the suggested solution (https://bioconductor.org/developers/how-to/git/abandon-changes/#force-bioconductor--to-github- <https://bioconductor.org/developers/how-to/git/abandon-changes/#force-bioconductor--to-github->), but there is a note "This works only if you haven’t pushed the change causing the issue to the Bioconductor repository." I fall into this case.

If anyone has any suggestions for how to deal with this, I would appreciate the help. If more information is required, please say so.

Thanks,
Raymond Cavalcante
	[[alternative HTML version deleted]]