search

jhsiao999 / peco

Predict cell cycle phase in a continuum from single-cell RNA-seq data
https://jhsiao999.github.io/peco/
GNU General Public License v3.0
12 stars 4 forks source link

Dev #19

Closed jhsiao999 closed 5 years ago

jhsiao999 commented 5 years ago

@jdblischak Instead of "Merge pull request", perhaps a better option is "Rebase and merge"?

jdblischak commented 5 years ago

You can try it, but "rebase and merge" will likely change the commit IDs (this is the rebasing part). And then master and dev will again be different from each other.

Do you plan to continue the parallel master and dev branches long-term? If yes, the GitHub PR interface is not ideal for that setup. The GitHub PR interface assumes that the branch being merged will then be discarded. The GitHub PR interface is better for a feature branch workflow. In other words, each time you want to make a change, you create a new branch, e.g. git checkout -b new-feature. Once the CI builds pass, then you can send a PR, do "rebase and merge", and then delete the feature branch.

If you want two parallel branches, you are better off doing the merges locally. The code below pulls the latest changes from the dev branch and merges them into the master branch.

git checkout dev
git pull origin dev
git checkout master
git merge dev
git push origin master
jhsiao999 commented 5 years ago

@jdblischak Thanks for the thorough feedbacks. I'd like two parallel branches for master and dev.

I'll keep the current dev branch until peco has been formally accepted into Bioconductor. Then I'll delete it and keep parallel branches locally.

Thanks!

Joyce