Hi Ben

It seem from your git log that, the duplicate commits are from RELEASE_3_5.

A good way to deal with this now is to just allow your incoming commits to get 
through. You should be able to send in your commits now.

But, one thing to note is, make sure you don't have any duplicate commits while 
pushing the newer commits. One way to check is

git log --oneline

Best,

Nitesh

________________________________
From: Bioc-devel <bioc-devel-boun...@r-project.org> on behalf of Ben Bolstad 
<b...@bmbolstad.com>
Sent: Sunday, May 12, 2019 1:10 PM
To: bioc-devel@r-project.org
Subject: [Bioc-devel] duplicate commits in preprocessCore

There seem to be duplicate commits in the commit history for preprocessCore. 
Probably due to some  git/svn/git-svn bridge operations I�ve long since 
forgotten about doing.  It would appear that these duplicate commits are 
already in the BioC git repository, so I cannot use the �switcheroo� option.


I know I should have come across and resolved this issue sometime ago, but my 
time available for package maintenance/development has been quite limited in 
recent years.
_______________________________________________
Bioc-devel@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.
        [[alternative HTML version deleted]]

_______________________________________________
Bioc-devel@r-project.org mailing list
https://stat.ethz.ch/mailman/listinfo/bioc-devel

Reply via email to