Skip to content

[Bioc-devel] merge github + bioc versions

2 messages · Venu Thatikonda, Shepherd, Lori

Original
Venu Thatikonda
# 
Hello all,

I am a bit confused by how git works with bioc ecosystem. I am following
this guide to sync my github + bioc repos (for the first time).

https://bioconductor.org/developers/how-to/git/sync-existing-repositories/

After step-6, I see following branches

* master
  remotes/origin/HEAD -> origin/master
  remotes/origin/master
  remotes/upstream/RELEASE_3_10
  remotes/upstream/master

So, if I add new features to the package and commit & push to master
branch, does it affect current version that is released in bioc10? Or do
they go to bioc11 devel branch and generate build reports, without
affecting the package in bioc10?

Should I create a branch RELEASE_3_11 and commit all changes to this
branch? I want the changes to be released in bioc11 and do not want to
affect bioc10 version.

Thank you & have a nice day!
Shepherd, Lori
# 
To push to your github branch
git push origin master

To push to the Bioconductor git server and have changes active in Bioconductor devel
git push upstream master


The upstream master branch is equivalent to whatever the current devel branch is on Bioconductor (in this case Bioc 3.11).  Pushing to the master branch will have no effect on the Bioc 3.10 (you would need to push to upstream RELEASE_3_10   in order to make changes to the Bioconductor Release 3.10 branch)


Hope this helps.


Lori Shepherd

Bioconductor Core Team

Roswell Park Comprehensive Cancer Center

Department of Biostatistics & Bioinformatics

Elm & Carlton Streets

Buffalo, New York 14263