Skip to content
Prev 12599 / 21312 Next

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

Hello,

I?m running into the following error when trying to push some changes to annotatr upstream/master:
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