Skip to content
Prev 12793 / 21312 Next
Original Raw

[Bioc-devel] "Error: duplicate commits" when pushing FamAgg to Bioconductor git

Turaga, Nitesh 
Hi,

It seems that there are multiple levels of duplication on your repository. 

You seem to have issued the ?merge? with not the current bioconductor devel but the (now deprecated) GitHub- bioconductor mirror, multiple times. Please correct me if this is not accurate. I?m wondering why the merge was issued so many times? 

As far as the fix goes, it would take me a while to track down the ?merge? commits and then ?cherry-pick" on to the master branch the commits that are not duplicated. These seem to be stemming right from the beginning of your development history. 

The steps you need are:

1. Back up master branch (git branch master_backup)
2. Check merge commit SHA?s (git log --oneline maste)
3. Reset to commit before the merge, (git reset --hard <commit_SHA>)
4. Then, overlay commits on top that reset, with latest non-duplicated commits (git cherry-pick <commit_SHA>)

You?d have to repeat these steps quite extensively depending on how many merges you have.

Take a look at this manual as further help to do this, http://sethrobertson.github.io/GitFixUm/fixup.html. 

Do these steps on your local repository and push to Github. Once you have done that, let me know and I?ll take a look at your Github repo, and sync with Bioconductor if history looks clean.

If you are unable to fix the repo, then the best way forward it to remove the pre-receive hook from your repository and deal with the history as is. This will not effect your package in anyway, just that the git history won?t be clean. 


Best,

Nitesh
This email message may contain legally privileged and/or confidential information.  If you are not the intended recipient(s), or the employee or agent responsible for the delivery of this message to the intended recipient(s), you are hereby notified that any disclosure, copying, distribution, or use of this email message is prohibited.  If you have received this message in error, please notify the sender immediately by e-mail and delete this email message from your computer. Thank you.

Thread (3 messages)

Rainer Johannes "Error: duplicate commits" when pushing FamAgg to Bioconductor git Feb 12 Turaga, Nitesh "Error: duplicate commits" when pushing FamAgg to Bioconductor git Feb 13 Rainer Johannes "Error: duplicate commits" when pushing FamAgg to Bioconductor git Feb 13