Dear Nitesh,
Thank you for pointing me to the website how to resolve the conflict.
I hope that now everything is ok.
For the records, here is what I did:
$ cd /Volumes/T3Data/CRAN/GIT/xps
$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
Untracked files:
(use "git
Hi
You have to fix the merge conflicts. Again, please take a look at the
documentation on the website
The canonical documentation for git:
http://bioconductor.org/developers/how-to/git/
The documentation relevant to your problem:
http://bioconductor.org/developers/how-to/git/resolve-conflict
Dear Marcel,
Thank you for the clarification, now it seems to work.
However, there is a strange problem. Here is what I did:
$ cd /Volumes/T3Data/CRAN/GIT/xps
$ git remote -v
origin g...@github.com:cstrato/xps.git (fetch)
origin g...@github.com:cstrato/xps.git (push)
upstreamg...@gi
Hi Christian,
Marcel is correct. The documentation is given here,
http://bioconductor.org/developers/how-to/git/pull-upstream-changes/.
Best,
Nitesh
> On May 14, 2018, at 6:22 PM, Marcel Ramos
> wrote:
>
> Hi Christian,
>
> It looks like you have to do
>
> *git pull upstream master *
>
Hi Christian,
It looks like you have to do
*git pull upstream master *
according to your `git remote -v`.
Regards,
Marcel
On 05/14/2018 04:21 PM, cstrato wrote:
> Dear Nitesh,
>
> Thank you for your fast reply. Here is what I tried now,
> including using 'git pull':
>
> $ cd /Volumes/T3Data
