Re: [Bioc-devel] Confusion with how to maintain release/devel files on local computer.

2017-11-03 Thread Arman Shahrisa
tput: > > > Arman@Arman-VAIO MINGW64 /z/cbaf/Source/cbaf (master) > > > $ git branch -a > > > * master > > > remotes/origin/HEAD -> origin/master > > > remotes/origin/RELEASE_3_6 > > > remotes/origin/master > > > remotes/

Re: [Bioc-devel] Confusion with how to maintain release/devel files on local computer.

2017-11-03 Thread Martin Morgan
gin/HEAD -> origin/master >   remotes/origin/RELEASE_3_6 >   remotes/origin/master >   remotes/upstream/RELEASE_3_6 >   remotes/upstream/master Thank you very much for your help. Best regards, Arman *From: *Martin Morgan <mailto:martin.mor...@roswellpark.org> *Sent:

Re: [Bioc-devel] Confusion with how to maintain release/devel files on local computer.

2017-11-02 Thread Martin Morgan
l.com>; Stephanie M. Gogarten <mailto:sdmor...@uw.edu>; bioc-devel <mailto:bioc-devel@r-project.org> *Subject: *Re: [Bioc-devel] Confusion with how to maintain release/devel files on local computer. On 11/01/2017 07:53 PM, Arman Shahrisa wrote: I cloned the package into a clean dire

Re: [Bioc-devel] Confusion with how to maintain release/devel files on local computer.

2017-11-01 Thread Martin Morgan
push upstream master and to github with git push origin master Martin Best regards, Arman From: Stephanie M. Gogarten<mailto:sdmor...@uw.edu> Sent: Thursday, November 2, 2017 02:19 To: Arman Shahrisa<mailto:shahrisa.ar...@hotmail.com> Cc: bioc-devel<mailto:bioc-devel@r-project.o

Re: [Bioc-devel] Confusion with how to maintain release/devel files on local computer.

2017-11-01 Thread Martin Morgan
From: Arman Shahrisa<mailto:shahrisa.ar...@hotmail.com> Sent: Thursday, November 2, 2017 03:23 To: Stephanie M. Gogarten<mailto:sdmor...@uw.edu>; bioc-devel Subject: RE: [Bioc-devel] Confusion with how to maintain release/devel files on local computer. I cloned the package into a clean

Re: [Bioc-devel] Confusion with how to maintain release/devel files on local computer.

2017-11-01 Thread Vincent Carey
arten<mailto:sdmor...@uw.edu>; bioc-devel bioc-devel@r-project.org> > Subject: RE: [Bioc-devel] Confusion with how to maintain release/devel > files on local computer. > > I cloned the package into a clean directory. Then I followed “New package > workflow” strategy. By checking Desc

Re: [Bioc-devel] Confusion with how to maintain release/devel files on local computer.

2017-11-01 Thread Arman Shahrisa
rg> Subject: Re: [Bioc-devel] Confusion with how to maintain release/devel files on local computer. One possible point of confusion: Laurent's workflow includes maintaining separate branches "master" and "devel", which he syncs to his own Github repo and Bioconductor's g

Re: [Bioc-devel] Confusion with how to maintain release/devel files on local computer.

2017-11-01 Thread Stephanie M. Gogarten
One possible point of confusion: Laurent's workflow includes maintaining separate branches "master" and "devel", which he syncs to his own Github repo and Bioconductor's git repo respectively. However, the documentation on the bioc website (https://bioconductor.org/developers/how-to/git/) assum

Re: [Bioc-devel] Confusion with how to maintain release/devel files on local computer.

2017-11-01 Thread Laurent Gatto
On 1 November 2017 20:36, Arman Shahrisa wrote: > I'm confused with development process. > > At first, I need to have a folder with accepted packaged. Then I need to pull > origion RELEASE_3_6? > > Then in another folder, I need to pull origion master? No, it all happens in the same folder, but

Re: [Bioc-devel] Confusion with how to maintain release/devel files on local computer.

2017-11-01 Thread Martin Morgan
On 11/01/2017 04:42 PM, Gabe Becker wrote: Arman, Not on the Bioc team per se, but I would say only have a checkout of the release branch when you need it, ie a bug is reported, you have fixed it in devel, and you are ready to push the very narrow bugfix to release. I only keep "master" checkout

Re: [Bioc-devel] Confusion with how to maintain release/devel files on local computer.

2017-11-01 Thread Gabe Becker
Arman, Not on the Bioc team per se, but I would say only have a checkout of the release branch when you need it, ie a bug is reported, you have fixed it in devel, and you are ready to push the very narrow bugfix to release. I only keep "master" checkouts of my packages on a permanent basis. You g

[Bioc-devel] Confusion with how to maintain release/devel files on local computer.

2017-11-01 Thread Arman Shahrisa
I�m confused with development process. At first, I need to have a folder with accepted packaged. Then I need to pull origion RELEASE_3_6? Then in another folder, I need to pull origion master? So that by opening each folder, I know what I�m editing. Also during push, I need to be careful about w