Hi all,
I submitted a merge commit, where I later realised that the only thing it includes are duplicate commits. This is the current log:
commit 80fccdc8bfcc8a4b6b8c17a8b2f46e19031b5cd8 (HEAD, bioc_upstream/master)
Merge: c6f7deb 0cc3075
Author: Alexander Gosdschan <alexander.gosdschan@mdc-berlin.de>
Date: Tue Oct 24 20:44:36 2017 +0200
Merge branch 'master' of ssh://github.com/alexg9010/methylKit
commit c6f7debc62b6cd5b6782512d0280db738da81991 (origin/master, origin/HEAD, github_upstream/master, newBiocMaster, master)
Author: Alexander Gosdschan <alexander.gosdschan@mdc-berlin.de>
Date: Tue Oct 24 20:22:47 2017 +0200
update news and bump version number
commit ae86509371d40dc536766b72e1919839986393d4
Author: Alexander Gosdschan <alexander.gosdschan@mdc-berlin.de>
Date: Tue Oct 24 20:18:52 2017 +0200
methCalls: write conversion stats to extra file
So I wanted to reset to the previous commit using the steps described here.
git reset --hard c6f7debc62b6cd5b6782512d0280db738da81991
The new log is this:
commit c6f7debc62b6cd5b6782512d0280db738da81991 (HEAD, origin/master, origin/HEAD, github_upstream/master, newBiocMaster, master)
Author: Alexander Gosdschan <alexander.gosdschan@mdc-berlin.de>
Date: Tue Oct 24 20:22:47 2017 +0200
update news and bump version number
commit ae86509371d40dc536766b72e1919839986393d4
Author: Alexander Gosdschan <alexander.gosdschan@mdc-berlin.de>
Date: Tue Oct 24 20:18:52 2017 +0200
methCalls: write conversion stats to extra file
But my forced push was rejected:
tursun16:methylKit agosdsc$ git push -f bioc_upstream master
Total 0 (delta 0), reused 0 (delta 0)
remote: FATAL: + refs/heads/master packages/methylKit a.gosdschan DENIED by fallthru
remote: error: hook declined to update refs/heads/master
To git.bioconductor.org:packages/methylKit.git
! [remote rejected] master -> master (hook declined)
error: failed to push some refs to 'git@git.bioconductor.org:packages/methylKit.git'
It would be nice if somebody could help me here, or at least explain why it did not work.
Best, Alex
Hi,
Thank you for your answer!
As there were no issues with the code in it's current state I will ignore those duplicate commits,
but definitely will pay more attention when updating the repo.