Hi Nitesh, Yes, I have pulled from upstream but still the same issue.
$ git pull upstream master From git.bioconductor.org:packages/maftools * branch master -> FETCH_HEAD Already up to date. $ git status On branch devel nothing to commit, working tree clean $ git push upstream master To git.bioconductor.org:packages/maftools.git ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to 'g...@git.bioconductor.org:packages/maftools.git' hint: Updates were rejected because a pushed branch tip is behind its remote hint: counterpart. Check out this branch and integrate the remote changes hint: (e.g. 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. > On 17 Dec 2018, at 5:43 PM, Turaga, Nitesh <nitesh.tur...@roswellpark.org> > wrote: > > Hi, > > Have your tried the command mentioned in the error message > > git pull > > > This is important. > > Once that is done, “IF” you have merge conflicts, please do > > http://bioconductor.org/developers/how-to/git/resolve-conflicts/ > > Best, > > Nitesh > >> On Dec 17, 2018, at 10:22 AM, Anand MT <anand...@hotmail.com> wrote: >> >> Hi all, >> >> I maintain maftools bioconductor package. I recently fixed several bugs >> which had resulted in build fail on devel branch of Bioconductor. However, I >> am unable to push them to upstream master. I have gone through help pages on >> Bioconductor page as well several other solutions online but I am not able >> to fix it. Please accept my apologies in advance if this has been already >> discussed before. >> >> Below are my git commands and error: >> >> $ git branch devel >> $ git checkout devel >> Switched to branch 'devel' >> $ git fetch upstream >> $ git merge upstream/master >> Auto-merging DESCRIPTION >> CONFLICT (content): Merge conflict in DESCRIPTION >> Automatic merge failed; fix conflicts and then commit the result. >> $ vi DESCRIPTION >> Fixed merge conflict >> $ git add . >> $ git commit -m "bug fixes" >> $ git status >> On branch devel >> nothing to commit, working tree clean >> $ git push upstream master >> To git.bioconductor.org:packages/maftools.git >> ! [rejected] master -> master (non-fast-forward) >> error: failed to push some refs to >> 'g...@git.bioconductor.org:packages/maftools.git' >> hint: Updates were rejected because a pushed branch tip is behind its remote >> hint: counterpart. Check out this branch and integrate the remote changes >> hint: (e.g. 'git pull ...') before pushing again. >> hint: See the 'Note about fast-forwards' in 'git push --help' for details. >> >> Could you please suggest me on how to proceed. >> >> -Anand. >> _______________________________________________ >> Bioc-devel@r-project.org mailing list >> https://stat.ethz.ch/mailman/listinfo/bioc-devel > > > > 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. _______________________________________________ Bioc-devel@r-project.org mailing list https://stat.ethz.ch/mailman/listinfo/bioc-devel
