Closed serachoi1230 closed 1 year ago
I think this might have to do with the difference between merging from master origin (GitHub) or master upstream (Bioconductor). These instructions might help. https://github.com/neurogenomics/labwiki/wiki/Creating-a-Bioconductor-package#6-bioconductor---future-development
Try this:
## Checkout from upstream
git checkout upstream/master
git merge origin/master
git merge upstream/master
git push upstream master
git push origin master
@Al-Murphy might be able to offer some advice too
Thanks Brian! I followed the labwiki page on Sunday and it didn't work for me then, but it's worked now for some reason! I've pushed to Bioconductor and GitHub :)
Hi @bschilder ,
My slack account has been deactivated, so I thought communicating here would be easier than email! I'm having some issues pushing to Bioconductor. Have you seen this error before?
So, when I push to upstream (Bioconductor), I get merge error:
Which is strange, because I'm not seeing merge conflicts anywhere:
I also merged upstream and origin, and I had no problems doing that:
Have you seen anything like this before?
Thank you so much!