Hi Divy,
Can you send me the output of your
git status
git remote -v
Best,
Nitesh
> On Jun 4, 2018, at 12:50 PM, Kangeyan, Divy wrote:
>
> Hi Nitesh,
>I followed the resolve merge conflict article you provided
> step by step. There was no error un
Hi Divy,
It might be possible that you did not resolve all the conflicts you have.
Generally, a `git status` will show you all the conflict files which are
needed to be cleaned up by the merge. When you do a clean conflict resolution,
you will be able to push cleanly to git.bioconductor.org.
Hi Lori,
When I try Git pull upstream master, I get an error saying
*Automatic
merge failed; fix conflicts and then commit results*. When I fix the
conflict and push it I get the same error as in my previous email. I have
attached the full error message when I pull the upstream master b
Have you tried doing a 'git pull upstream master' ? Do you get any messages
when running that command?
Generally try the following and post any error messages:
Git pull upstream master
( resolve any merge conflicts and commit )
( make any additional changes and commit)
Git push upstream master
