[Bioc-devel] Git error when pushing to bioconductor

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.

Did you follow http://bioconductor.org/developers/how-to/git/resolve-
conflicts/?

Please send me the output of following that document above.

Best

Nitesh

On Jun 3, 2018, at 10:55 PM, Kangeyan, Divy <divyswar01 at g.harvard.edu>

wrote:

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 branch

here.

Thank you,
Divy

On Sun, Jun 3, 2018 at 9:28 PM, Shepherd, Lori <
Lori.Shepherd at roswellpark.org> wrote:

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


Lori Shepherd
Bioconductor Core Team
Roswell Park Cancer Institute
Department of Biostatistics & Bioinformatics
Elm & Carlton Streets
Buffalo, New York 14263
------------------------------
*From:* Bioc-devel <bioc-devel-bounces at r-project.org> on behalf of
Kangeyan, Divy <divyswar01 at g.harvard.edu>
*Sent:* Sunday, June 3, 2018 4:07:48 PM
*To:* Bioc-devel at r-project.org
*Subject:* [Bioc-devel] Git error when pushing to bioconductor

Hi,
   I maintain the scmeth package in bioconductor. Recently I made some
changes to the packages in my local branch and when I tried pushing it

to

the bioconductor I got an error saying (Updates were rejected because

the

tip of your current branch is behind its remote counterpart). I have
attached the screenshot.

I tried resolving the conflict manually and after that when I pushed the
changes I still got the same error. Any help with resolving the error is
greatly appreciated.

Thank you,
Divy Kangeyan

This email message may contain legally privileged and/or confidential
information. If you are not the intended recipient(s), or the employee

or

agent responsible for the delivery of this message to the intended
recipient(s), you are hereby notified that any disclosure, copying,
distribution, or use of this email message is prohibited. If you have
received this message in error, please notify the sender immediately by
e-mail and delete this email message from your computer. Thank you.

--
Thank you,
Divy Kangeyan
<https://www.linkedin.com/profile/preview?vpa=pub&locale=en_US>
<https://divyup.wordpress.com>  <https://www.flickr.com/

photos/divyagash/>

<git_pull_error.png>_______________________________________________
Bioc-devel at r-project.org mailing list

This email message may contain legally privileged and/or confidential
information.  If you are not the intended recipient(s), or the employee or
agent responsible for the delivery of this message to the intended
recipient(s), you are hereby notified that any disclosure, copying,
distribution, or use of this email message is prohibited.  If you have
received this message in error, please notify the sender immediately by
e-mail and delete this email message from your computer. Thank you.