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