Could you please provide the full output from the following:
git remote -v git checkout master git fetch upstream git merge upstream/master Lori Shepherd Bioconductor Core Team Roswell Park Cancer Institute Department of Biostatistics & Bioinformatics Elm & Carlton Streets Buffalo, New York 14263 ________________________________ From: Bioc-devel <bioc-devel-boun...@r-project.org> on behalf of Arman Shahrisa <shahrisa.ar...@hotmail.com> Sent: Tuesday, October 31, 2017 5:54:37 PM To: bioc-devel Subject: [Bioc-devel] I can't merge the changes by bioc team with my accepted package Hi, I�m the maintainer of the package �cbaf�. It�s a new package for bioc v 3.6. I�m trying to pull changes that are created during package publication. I�m doing according to https://bioconductor.org/developers/how-to/git/new-package-workflow/ and https://bioconductor.org/developers/how-to/git/pull-upstream-changes/ When I run the following command > git merge upstream/master This message appears: > merge: upstream/master � not something we can merge Why? Best regards, Arman [[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]] _______________________________________________ Bioc-devel@r-project.org mailing list https://stat.ethz.ch/mailman/listinfo/bioc-devel
