gt;>> Auto-merging CHANGES
>>>>>>>
>>>>>>> CONFLICT (add/add): Merge conflict in CHANGES
>>>>>>>
>>>>>>> [modified files to keep changes intended for SVN Bioconductor
>>>>>>> repository]
>>>>>>>
>>>&g
and I provided that key in the git/svn
transition
Google Doc file.
I was trying to provide a key what would only affect the COHCAP
package,
and not the other projects that are not Bioconductor projects.
Please let
me know if this still works.
Thanks,
Charles
On Thu, Aug 24, 2017 at 5:59 AM,
the remote changes (e.g.
>>>>>
>>>>> hint: 'git pull ...') before pushing again.
>>>>>
>>>>> hint: See the 'Note about fast-forwards' in 'git push --help' for
>>>>> details.
>>>>>
>>>>
kflow/
>>>> >
>>>> > • SSH (developer) read / write access:
>>>> g...@git.bioconductor.org
>>>> > • HTTPS (public) read only access:
>>>> https://git.bioconductor.org
>>>> >
>>>> >
>&
I'm testing making a minor change (not affecting functionality, in
>>> the
>>> > "CHANGES" text file) to one of the files from the Bioconductor
>>> repository
>>> > (without trying to sync the repositories), and I get the following
>>> error
>>> &
t; >
>> > > Checking connectivity... done.
>> > >
>> > > cwarden$ cd COHCAP
>> > >
>> > > COHCAP cwarden$ git checkout master
>> > >
>> > > Already on 'master'
>> > >
>> > > Your branch
commit -a -m "fake commit"
> > >
> > > [master 225f7ac] fake commit
> > >
> > > 1 file changed, 1 insertion(+)
> > >
> > > COHCAP cwarden$ git status
> > >
> > > On branch master
> > >
> > >
onductor repository?
> >
> > Thanks,
> > Charles
> >
> > On Thu, Aug 24, 2017 at 11:07 AM, Charles Warden
> wrote:
> > Hi Martin and Nitesh,
> >
> > Thanks for your help.
> >
> > I created a public ssh-key, I added it as a deploy key
les
>
> On Thu, Aug 24, 2017 at 5:59 AM, Martin Morgan
> wrote:
> On 08/24/2017 07:27 AM, Turaga, Nitesh wrote:
> http://bioconductor.org/developers/how-to/git/<http://bioconductor.org/developers/how-to/git/faq/>faq<http://bioconductor.org/developers/how-to/git/faq/>/&
rs/how-to/git/<http://biocon
>>> ductor.org/developers/how-to/git/faq/>faq<http://bioconducto
>>> r.org/developers/how-to/git/faq/>/<http://bioconductor.org/
>>> developers/how-to/git/faq/>
>>>
>>> Get Outlook for Android<https://aka.ms/
>> From: Charles Warden
>> Sent: Wednesday, August 23, 2017 11:32:42 PM
>> To: Turaga, Nitesh
>> Subject: Re: [Bioc-devel] COHCAP GitHub Update
>>
>> Hi Nitesh,
>>
>> I am getting a slightly different error message,
oid<https://aka.ms/ghei36>
From: Charles Warden
Sent: Wednesday, August 23, 2017 11:32:42 PM
To: Turaga, Nitesh
Subject: Re: [Bioc-devel] COHCAP GitHub Update
Hi Nitesh,
I am getting a slightly different error message, now that I am changing to be
wit
017 11:32:42 PM
> To: Turaga, Nitesh
> Subject: Re: [Bioc-devel] COHCAP GitHub Update
>
> Hi Nitesh,
>
> I am getting a slightly different error message, now that I am changing to be
> within the COHCAP directory:
>
> ## Start Code
>
> COHCAP c
___
From: Charles Warden
Sent: Wednesday, August 23, 2017 11:32:42 PM
To: Turaga, Nitesh
Subject: Re: [Bioc-devel] COHCAP GitHub Update
Hi Nitesh,
I am getting a slightly different error message, now that I am changing to be
within the COHCAP directory:
## Start Code
C
Hi
Maybe what you want to follow is this
http://bioconductor.org/developers/how-to/git/maintain-github-bioc/,
Best,
Nitesh
> On Aug 23, 2017, at 5:13 PM, Charles Warden wrote:
>
> Hi,
>
> I downloaded code for the COHCAP Bioconductor SVN repository (
> https://hedgehog.fhcrc.org/bioconduct
Hi
> On Aug 23, 2017, at 5:13 PM, Charles Warden wrote:
>
> Hi,
>
> I downloaded code for the COHCAP Bioconductor SVN repository (
> https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/COHCAP/), made
> some changes, and then tried to commit those changes. However, I got an
> error mess
Hi,
I downloaded code for the COHCAP Bioconductor SVN repository (
https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/COHCAP/), made
some changes, and then tried to commit those changes. However, I got an
error message that the SVN repository is locked, so the changes could not
be upload
17 matches
Mail list logo
