[Bioc-devel] EXTERNAL: Cardinal duplicate commits

[Turaga, Nitesh]

Hi Kylie,

I have reset your package to its original state. The best way to proceed is with this documentation, http://master.bioconductor.org/developers/how-to/git/sync-existing-repositories/

You specifically want to take a look at point#8 (http://master.bioconductor.org/developers/how-to/git/abandon-changes/#force-bioconductor--to-github-).

It is the process of switching your master branch, on your Github. Feel free to ask questions on bioc-devel. 

Best,

Nitesh 

> On Oct 17, 2017, at 5:14 PM, Turaga, Nitesh <Nitesh.Turaga at RoswellPark.org> wrote:
> 
> Hi Kylie,
> 
> I will take a look at your package and get back to you. Avoid making any changes till I give you further notice. 
> 
> Best,
> 
> Nitesh 
> 
>> On Oct 17, 2017, at 1:13 PM, Bemis, Kylie <k.bemis at northeastern.edu> wrote:
>> 
>> Hi all,
>> 
>> I have a problem with duplicate commits in my package “Cardinal”. So far I have avoided making more commits to my other package “matter” until I am sure how to avoid this again.
>> 
>> Soon after the git transition, I made a few small commits to the Bioconductor git repo, which I notice now included duplicate commits in the history. They were not rejected at the time. New commits now are rejected for me.
>> 
>> Locally and on my own Github repo (https://github.com/kuwisdelu/Cardinal) I have reverted to a commit from before I merged the Bioconductor master, to get a clean history without duplicate commits.
>> 
>> I have been trying to push this with
>> 
>> 
>> git push -f upstream
>> 
>> from the “Abandon changes” help page.
>> 
>> This is being rejected with:
>> 
>> kuwisdelu$ git push --force upstream master
>> Total 0 (delta 0), reused 0 (delta 0)
>> remote: FATAL: + refs/heads/master packages/Cardinal k.bemis DENIED by fallthru
>> remote: error: hook declined to update refs/heads/master
>> To git.bioconductor.org<http://git.bioconductor.org>:packages/Cardinal.git
>> ! [remote rejected] master -> master (hook declined)
>> error: failed to push some refs to 'git at git.bioconductor.org<mailto:git at git.bioconductor.org>:packages/Cardinal.git'
>> 
>> What is the best way to get a clean history and avoid this happening again?
>> 
>> Thank you,
>> Kylie
>> 
>> ~~~
>> Kylie Ariel Bemis
>> Future Faculty Fellow
>> College of Computer and Information Science
>> Northeastern University
>> kuwisdelu.github.io<https://kuwisdelu.github.io>
>> 
>> 
>> 
>> 
>> 
>> 	[[alternative HTML version deleted]]
>> 
>> _______________________________________________
>> Bioc-devel at r-project.org mailing list
>> https://stat.ethz.ch/mailman/listinfo/bioc-devel
> 
> 
> 
> 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.
> _______________________________________________
> Bioc-devel at r-project.org mailing list
> https://stat.ethz.ch/mailman/listinfo/bioc-devel



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.