Re: [Bioc-devel] Bioconductor package IMMAN

2020-03-26 Thread Shepherd, Lori
I do see changes on our git server from today March 26 th so maybe this has been resolved? But generally that means you need to do a fetch --all # gets all branches from remotes and do a git pull upstream master # this gets any changes from the upstream remote master branch It is always re

Re: [Bioc-devel] Bioconductor package IMMAN

2020-03-26 Thread minoo ashtiani
Dear Lori, Thanks for your help. I went according to your advice but I permanently get error in the upstream mode, here is the output: mintty screen dump Minoo@DESKTOP-PGH7233 MINGW64 ~/Desktop/IMMAN (master) $ git push origin master git Enumerating objects: 9, done.

Re: [Bioc-devel] Bioconductor package IMMAN

2020-03-23 Thread Shepherd, Lori
I would do a git fetch --all # get all branches git pull upstream master # pulls changes from Bioconductor git server # resolve any merge conflicts that arise. It is good practice to always pull from origin and upstream before making any changes to code to make sure the code base is updated

Re: [Bioc-devel] Bioconductor package IMMAN

2020-03-23 Thread minoo ashtiani
Hi Lori, Thanks for the update. I edited the vignette in which the platform error comes from that. I updated the by using 1. git push origin master 2. command and it was OK, however when I wanted to run the second command line 1. git push upstream master 2. I faced error