[Bioc-devel] fetch upstream of an existing package
Hello, Nitesh, The FAQ is very helpful. I have the remote access to the bioconductor repository now. The package is "sparsenetgls" and now can be cloned. I have checked all the changes in the updated version. I am going to commit changes in the bioconductor repository, but received the following error message: " $ git merge upstream/master Auto-merging DESCRIPTION CONFLICT (content): Merge conflict in DESCRIPTION Automatic merge failed; fix conflicts and then commit the result. " I have changed the description file, before the merge. I have also used fetch upstream, and then merge, I have received the following message: " $ git merge upstream/master error: Merging is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm <file>' hint: as appropriate to mark resolution and make a commit. fatal: Exiting because of an unresolved conflict. " Appreciated your guidance, with best wishes, Irene?
From: Turaga, Nitesh <Nitesh.Turaga at RoswellPark.org>
Sent: Thursday, 3 September 2020 1:17 a.m.
To: Irene Zeng
Cc: bioc-devel
Subject: Fwd: [Bioc-devel] fetch upstream of an existing package
Sent: Thursday, 3 September 2020 1:17 a.m.
To: Irene Zeng
Cc: bioc-devel
Subject: Fwd: [Bioc-devel] fetch upstream of an existing package
Hi, Can you tell me which package you are talking about? Also, please take a look at the FAQ https://bioconductor.org/developers/how-to/git/faq/ and see if there are any points there which address your concern. Specifically take a look at number 13 and 14. If you have any follow-up questions feel free to reach out. Best regards Nitesh On Aug 30, 2020, at 4:23 AM, Irene Zeng <i.zeng at auckland.ac.nz<mailto:i.zeng at auckland.ac.nz>> wrote: Dear Bioconductor core team, I am submitting changes to an existing package , I received the following error message when I used git to fetch upstream repository. I have received these message: " $ git fetch upstream git at git.bioconductor.org<mailto:git at git.bioconductor.org>: Permission denied (publickey). fatal: Could not read from remote repository. Please make sure you have the correct access rights and the repository exists. " I have added the publickey to the github account of the package, could you please advise? Irene ________________________________________ From: Bioc-devel <bioc-devel-bounces at r-project.org<mailto:bioc-devel-bounces at r-project.org>> on behalf of bioc-devel-request at r-project.org<mailto:bioc-devel-request at r-project.org> <bioc-devel-request at r-project.org<mailto:bioc-devel-request at r-project.org>> Sent: Tuesday, 25 August 2020 10:00 p.m. To: bioc-devel at r-project.org<mailto:bioc-devel at r-project.org> Subject: Bioc-devel Digest, Vol 197, Issue 21 Send Bioc-devel mailing list submissions to bioc-devel at r-project.org<mailto:bioc-devel at r-project.org> To subscribe or unsubscribe via the World Wide Web, visit https://stat.ethz.ch/mailman/listinfo/bioc-devel or, via email, send a message with subject or body 'help' to bioc-devel-request at r-project.org<mailto:bioc-devel-request at r-project.org> You can reach the person managing the list at bioc-devel-owner at r-project.org<mailto:bioc-devel-owner at r-project.org> When replying, please edit your Subject line so it is more specific than "Re: Contents of Bioc-devel digest..." Today's Topics: 1. Re: About rcellminerData and rcellminerData new versions (Elloumi, Fathi (NIH/NCI) [C]) ---------------------------------------------------------------------- Message: 1 Date: Tue, 25 Aug 2020 00:01:37 +0000 From: "Elloumi, Fathi (NIH/NCI) [C]" <fathi.elloumi at nih.gov<mailto:fathi.elloumi at nih.gov>> To: =?utf-8?B?SGVydsOpIFBhZ8Oocw==?= <hpages at fredhutch.org<mailto:hpages at fredhutch.org>> Cc: "Turaga, Nitesh" <Nitesh.Turaga at RoswellPark.org<mailto:Nitesh.Turaga at RoswellPark.org>>, "nitesh.turaga at gmail.com<mailto:nitesh.turaga at gmail.com>" <nitesh.turaga at gmail.com<mailto:nitesh.turaga at gmail.com>>, bioc-devel <bioc-devel at r-project.org<mailto:bioc-devel at r-project.org>> Subject: Re: [Bioc-devel] About rcellminerData and rcellminerData new versions Message-ID: <F601D572-8465-4D58-B399-D944C8B76855 at nih.gov<mailto:F601D572-8465-4D58-B399-D944C8B76855 at nih.gov>> Content-Type: text/plain; charset="utf-8" Dear Herv?, Thank you very much for your clarification. I already pushed updates (more data) that will have impact on the output. I saw that you committed the April 27th version (2.10.0) for RELEASE_3_11. Looking at this link : https://bioconductor.org/developers/how-to/git/abandon-changes/ , it seems that the Bioconductor team can reset a previous commit. Please let me know if this the right way to do it as described in the previous link. Please advise. Best, Fathi ?On 8/21/20, 5:45 PM, "Herv? Pag?s" <hpages at fredhutch.org<mailto:hpages at fredhutch.org>> wrote: Hi Fathi, The purpose of the "only bug fixes and documentation improvements in release" policy is **stability** of the current release (BioC 3.11). That is, we want to avoid disruption and to make analyses that use BioC 3.11 as reproducible as possible. This means that if the changes to the RELEASE_3_11 branch of the rcellminer and rcellminerData packages have the potential to break some of the scripts that your users are using for their analyses, or to change their output, then these changes should not be pushed to the RELEASE_3_11 branch. Note that we can only realistically aim at preserving things as stable as possible within the current release. Of course your software should be able to evolve over time. This is why important changes are allowed in devel (BioC 3.12). So the important question is: are the changes you pushed to BioC 3.11 going to preserve stability? You are in the best position to answer that question. We (Nitesh and myself) lack context to answer it. Maybe Daniel knows a little bit more about what kind of changes you made but unfortunately he's no longer part of the BioC core team. Bottom line is: If the changes don't preserve stability, please don't push them to the release branch. Please don't hesitate to ask on the bioc-devel mailing list if you have concerns or questions about this. Best, H. On 8/21/20 09:34, Elloumi, Fathi (NIH/NCI) [C] wrote: Dear Bioconductor team, As mentioned in my previous email (please see below), do you consider adding and cleaning data an enhancement should be only included in the develop branch and NOT in the current release (3_11) branch version but in the new release 3_12? I followed the instructions at https://bioconductor.org/developers/how-to/git/sync-existing-repositories/ <https://urldefense.proofpoint.com/v2/url?u=https-3A__bioconductor.org_developers_how-2Dto_git_sync-2Dexisting-2Drepositories_&d=DwMGaQ&c=eRAMFD45gAfqt84VtBcfhQ&r=BK7q3XeAvimeWdGbWY_wJYbW0WYiZvSXAJJKaaPhzWA&m=ARmhemKVIMghSoos_q1dvQqxgobSqzyAD0FygSN-ZKU&s=TgJZrpJBaFZWeoPF8RdX5IiuL0buMRdvjYdIcWDdyNo&e=> with instruction to update on both devel and release branches. Please advise. Best, Fathi *From: *"Elloumi, Fathi (NIH/NCI) [C]" <fathi.elloumi at nih.gov<mailto:fathi.elloumi at nih.gov>> *Date: *Friday, August 21, 2020 at 10:51 AM *To: *"Van Twisk, Daniel" <Daniel.VanTwisk at RoswellPark.org<mailto:Daniel.VanTwisk at RoswellPark.org>> *Subject: *About rcellminerData and rcellminerData new versions Dear Daniel, This week I pushed new version (2.10.2) for both packages rcellminer and rcellminerData in the release_3_11 adding new drug data and cleaning some ?bad? experiments. Do you consider this against your policy here below. /From the Bioconductor paper in 2004/ /(//https://genomebiology.biomedcentral.com/articles/10.1186/gb-2004-5-10-r80/ <https://urldefense.proofpoint.com/v2/url?u=https-3A__genomebiology.biomedcentral.com_articles_10.1186_gb-2D2004-2D5-2D10-2Dr80&d=DwMGaQ&c=eRAMFD45gAfqt84VtBcfhQ&r=BK7q3XeAvimeWdGbWY_wJYbW0WYiZvSXAJJKaaPhzWA&m=ARmhemKVIMghSoos_q1dvQqxgobSqzyAD0FygSN-ZKU&s=YLZtYlTV7z-tuoZq2DBOY6jMZviyPBSyBTh1plvFEzI&e=>/):/ /The only changes allowed to be made on the release version are bug/ /fixes and documentation improvements. This ensures that users will not/ /encounter radical new behaviors in code obtained in the release/ /version. All other changes such as enhancements or design changes are/ /carried out on the development branch [34]./ Please let me know asap and if needed we will back to previous commit. Thanks, -- Fathi Fathi Elloumi, PhD Sr. Bioinformatics Software Engineer Contractor GDIT Inc Developmental Therapeutics Branch NIH/NCI/CCR Phone: 240-760-6601 -- Herv? Pag?s Program in Computational Biology Division of Public Health Sciences Fred Hutchinson Cancer Research Center 1100 Fairview Ave. N, M1-B514 P.O. Box 19024 Seattle, WA 98109-1024 E-mail: hpages at fredhutch.org<mailto:hpages at fredhutch.org> Phone: (206) 667-5791 Fax: (206) 667-1319 ------------------------------ Subject: Digest Footer _______________________________________________ Bioc-devel mailing list Bioc-devel at r-project.org<mailto:Bioc-devel at r-project.org> https://stat.ethz.ch/mailman/listinfo/bioc-devel ------------------------------ End of Bioc-devel Digest, Vol 197, Issue 21 ******************************************* _______________________________________________ Bioc-devel at 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.