[Bioc-devel] Duplicate commits in mimager package

I recently had a similar problem with my FamAgg and ensembldb packages. I had to remove the duplicated commits with `git rebase -i <sha from last non-duplicated commit>` (i.e. interactive rebasing). During/after that I had to fix some merge conflicts and ended overwriting my github master with the cleaned history (`git push -f origin master`) - Nithesh replaced then the Bioconductor git repos with the fixed github masters.

I think the duplicated commits are leftovers from my (potentially faulty) git-svn setup.

cheers, jo

On 6 Mar 2018, at 21:41, Aaron Wolen <aaron at wolen.com> wrote:

Thanks, Nitesh, There are about 20 dupes. Here are a few examples:

- 2c01b08 and c0f7ed1
- 77a5d90 and 464edd9
- b952032 and 9abf5dd

On Mar 6, 2018, 1:27 PM -0500, Turaga, Nitesh <Nitesh.Turaga at roswellpark.org>, wrote:

Hi Aaron,

You cannot force push to the Bioconductor server as it is prevented by a pre-receive hook on our end.

There are no duplicate commits on the Bioconductor version of the package right now. Can you point the commits which are duplicated on a fresh clone of the mimager package from git.bioconductor.org?



Best,

Nitesh

On Mar 6, 2018, at 12:23 PM, Aaron Wolen <aaron at wolen.com> wrote:

Hi all,

I attempted syncing my existing GitHub repo for the mimager package with git.bioconductor.org and was left with many duplicate commits, as documented.

Hoping to keep my history intact, I performed a rebase to clean-up the dupes (giving preference to commits with git-svn-ids) but can?t force push these changes upstream to Bioconductor. Would it be possible to update the Bioconductor history to match what?s on GitHub (https://github.com/aaronwolen/mimager), similar to what was done for the ASSIGN package?

Thanks,
Aaron

[[alternative HTML version deleted]]

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.

[[alternative HTML version deleted]]