I am trying to fix the error that our package bumphunter is producing. The error is due to a data file that is used in the tests which was moved and has a new URL. But when I try to push to upstream, I get an error about duplicate commits. I did this: (i) followed the instructions in the page "force Bioconductor master to GitHub master" (ii) cherry-picked the commit from master_deprecated which fixes the bug and (iii) tried to push upstream. But I'm still getting the same error.
I can't figure out what to do. Do I have to rebase somewhere?
I have the
git log --one-line --graph output I can send if that would be informative.
Any advice you can offer would be extremely helpful.
commit b403a19b826e6f1247c3db382b39eef6e4939314 Author: firstname.lastname@example.org <email@example.com@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/bumphunter@129129 bc3139a8-67e5-0310-9ffc-ced21a209358
commit 455927c2a83a7358ec071c4417e75eedfa124955 Author: Herve Pages <firstname.lastname@example.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/bumphunter@129129 bc3139a8-67e5-0310-9ffc-ced21a209358