Re: [Bioc-devel] New pre-receive hook on git.bioconductor.org

2017-08-30 Thread Turaga, Nitesh
Hi Stephanie, Merge commits are allowed. I have made changes, please try again. It should go through. Best, Nitesh > On Aug 30, 2017, at 5:58 PM, Stephanie M. Gogarten > wrote: > > Hi Nitesh, > > Does this mean that merge commits are not allowed? I have been

Re: [Bioc-devel] Package changes not merging with upstream

2017-08-30 Thread Tiago Chedraoui Silva
I worked. Thank you! Em 30 de ago de 2017 3:48 PM, "Martin Morgan" escreveu: > On 08/30/2017 06:20 PM, Tiago Chedraoui Silva wrote: > >> Hello, >> >> I had the same problem with the ELMER.data package (Experiment package). >> >> *>

Re: [Bioc-devel] Package changes not merging with upstream

2017-08-30 Thread Martin Morgan
On 08/30/2017 06:20 PM, Tiago Chedraoui Silva wrote: Hello, I had the same problem with the ELMER.data package (Experiment package). *> tiagochst@epigenomeFMRP3:~/ELMER.data$ git push upstream master* FATAL: W any packages/ELMER.data t.silva DENIED by fallthru (or you mis-spelled the reponame)

Re: [Bioc-devel] Package changes not merging with upstream

2017-08-30 Thread Tiago Chedraoui Silva
Hello, I had the same problem with the ELMER.data package (Experiment package). *> tiagochst@epigenomeFMRP3:~/ELMER.data$ git push upstream master* FATAL: W any packages/ELMER.data t.silva DENIED by fallthru (or you mis-spelled the reponame) fatal: Could not read from remote repository. *>

Re: [Bioc-devel] New pre-receive hook on git.bioconductor.org

2017-08-30 Thread Stephanie M. Gogarten
Hi Nitesh, Does this mean that merge commits are not allowed? I have been developing features on branches and then merging back into the master branch with a merge commit, which helps me keep track of which commits go together in a single feature. But when I just tried to push upstream, I

[Bioc-devel] build reports

2017-08-30 Thread Obenchain, Valerie
We're having a few problems smoothing out the git-based builds. Unfortunately there will be no build report for either release or devel today ... we hope to have this back on track for tomorrow. Thanks for your patience. Valerie This email message may contain legally privileged and/or

Re: [Bioc-devel] Pushing changes to RELEASE_3_5

2017-08-30 Thread Laurent Gatto
On 30 August 2017 12:04, Turaga, Nitesh wrote: > Hi Laurent, > > Please try again and let me know. Thank you Nitesh, pushed successfully now. Laurent >> On Aug 29, 2017, at 5:51 PM, Laurent Gatto wrote: >> >> >> On 29 August 2017 21:49, Turaga, Nitesh wrote: >> >>> Hi

Re: [Bioc-devel] Problems with updating release branch

2017-08-30 Thread Sean Davis
Hi, Zach. The release branch was rebuilt based on the snapshot date listed here: http://bioconductor.org/checkResults/release/bioc-LATEST/ And if you look at GenVisR on that page, the last change that was picked up is given in the table. In short, wait a little longer. Sean On Wed, Aug 30,

[Bioc-devel] Problems with updating release branch

2017-08-30 Thread Zach Skidmore
Hi All, On Monday I pushed a few documentation/bug updates to RELEASE_3_5 from these remotes: bioc g...@git.bioconductor.org:packages/GenVisR.git (fetch) bioc

Re: [Bioc-devel] New pre-receive hook on git.bioconductor.org

2017-08-30 Thread Angerer, Philipp
hi nitesh, thank you, it worked now! best, philipp Von: "Nitesh Turaga" An: "Philipp Angerer" CC: "bioc-devel" Gesendet: Mittwoch, 30. August 2017 14:04:50 Betreff: Re: [Bioc-devel] New

Re: [Bioc-devel] New pre-receive hook on git.bioconductor.org

2017-08-30 Thread Turaga, Nitesh
Hi Sean, A `git diff` between an "empty commit” (commit without a body, such as—`Creating branch for BioC 3.5 release`) and a commit with a body, results in an empty diff. So unfortunately, it catches things which are not supposed to be caught. This is an edge case which I’ve missed (but

Re: [Bioc-devel] New pre-receive hook on git.bioconductor.org

2017-08-30 Thread Sean Davis
Hi, Nitesh. Can you fill us in on what is changing between "duplicated commits" and "please try again"? Thanks, Sean On Wed, Aug 30, 2017 at 8:04 AM, Turaga, Nitesh < nitesh.tur...@roswellpark.org> wrote: > Hi Philipp, > > Please try again. > > Best, > > Nitesh > > > > On Aug 30, 2017, at

Re: [Bioc-devel] New pre-receive hook on git.bioconductor.org

2017-08-30 Thread Turaga, Nitesh
Hi Philipp, Please try again. Best, Nitesh > On Aug 30, 2017, at 4:33 AM, Angerer, Philipp > wrote: > > hi, sadly my duplicate commits are authored by Herve Pages and already in the > repo, so i can’t work at all on my package (destiny). > > $ git

Re: [Bioc-devel] New pre-receive hook on git.bioconductor.org

2017-08-30 Thread Angerer, Philipp
hi, sadly my duplicate commits are authored by Herve Pages and already in the repo , so i can’t work at all on my package (destiny). $ git push Zähle Objekte: 12, Fertig. Delta compression using up to 8 threads. Komprimiere Objekte: 100% (12/12), Fertig. Schreibe Objekte: 100% (12/12), 1.14