Hi Yuande, This is being blocked because you have completely unrelated histories from what you have on your Github to the Bioc-git repo. We deliberately don’t allow force pushing.
Are you sure you want to merge the unrelated histories? This is important to consider, particularly because we’ve had this problem of packages having duplicate commits.Please make sure your Github Repo does not have any duplicate commits. (“git log --oneline”) If you think the Github repo is at a state where it needs to synced to the Bioc-git repo, let me know and I’ll take a look at it and sync it for you. Send me the link to your Github repo or just send me the output to “git remove -v”. Best, Nitesh > On Mar 25, 2018, at 11:55 AM, Yuande Tan <tanyua...@gmail.com> wrote: > > Dear All, > I tried to git push upstream master but I met problem: > > To git.bioconductor.org:packages/MBttest.git > > ! [rejected] master -> master (non-fast-forward) > > error: failed to push some refs to 'g...@git.bioconductor.org: > packages/MBttest.git' > > hint: Updates were rejected because the tip of your current branch is behind > > hint: its remote counterpart. Integrate the remote changes (e.g. > > hint: 'git pull ...') before pushing again. > > > Actually fixed merge conflict by using git add . and git commit -m > "Resolved merge conflict by incorporating both suggestions." > > and git add ../README.md and git commit -m "add README.md file." > > I used git pull --allow-unrelated-histories origin master > > and I got > > > From https://github.com/Yuande/MBttest > > * branch master -> FETCH_HEAD > > Already up to date. > > I still did *~/.ssh*$ git push upstream master and I got the same error > (non-fast-forward). > > > When I used *~/.ssh*$ git push -f upstream master, I got "error: hook > declined to update refs/heads/master" > > > > So how do I address this "hook declined" error? > > > Thanks > > > Yuande Tan > > [[alternative HTML version deleted]] > > _______________________________________________ > 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
