Experimental Physics and
Industrial Control System

Hi Dirk, 

would you be OK if we put the HowToWorkWithTheEpicsRepository document to docs.epics-controls.org (the source would go to github and get processed and published from there)?

I can do the copying and initial set-up, you can still edit the text (source) later yourself if you want, it will just be on Github (https://github.com/epics-docs) rather than Launchpad. 
Also, if you do not mind, I would prefer to change the format to rst (RestructuredText). 

Timo

On 24/03/20 20:38, "Core-talk on behalf of Ben Franksen via Core-talk" <core-talk-bounces at aps.anl.gov on behalf of core-talk at aps.anl.gov> wrote:

    Am 24.03.20 um 18:02 schrieb Ben Franksen via Core-talk:
    > I tried to issue a merge request for branch 7.0 of lp:epics-base but I
    > get a failure message saying:
    >
    > lp:~bfrk/+git/epics_base is not mergeable into this repository.
    
    I fixed it by re-cloning my git repo, merging Dirk's changes,
    cherry-picking my own, and then re-creating the repo on launchpad. Also
    renamed the branch.
    
    PS: many thanks to Dirk Zimoch for writing the
    HowToWorkWithTheEpicsRepository, very concise and to the point.
    
    Cheers
    Ben
    
    ________________________________
    
    Helmholtz-Zentrum Berlin für Materialien und Energie GmbH
    
    Mitglied der Hermann von Helmholtz-Gemeinschaft Deutscher Forschungszentren e.V.
    
    Aufsichtsrat: Vorsitzender Dr. Volkmar Dietz, stv. Vorsitzende Dr. Jutta Koch-Unterseher
    Geschäftsführung: Prof. Dr. Bernd Rech (Sprecher), Prof. Dr. Jan Lüning, Thomas Frederking
    
    Sitz Berlin, AG Charlottenburg, 89 HRB 5583
    
    Postadresse:
    Hahn-Meitner-Platz 1
    D-14109 Berlin
    

References:

Re: write to a single element of an array field Ben Franksen via Core-talk

Re: write to a single element of an array field Ben Franksen via Core-talk

Re: write to a single element of an array field Ben Franksen via Core-talk

Re: write to a single element of an array field Ralph Lange via Core-talk

Re: write to a single element of an array field Ben Franksen via Core-talk

Re: write to a single element of an array field Ralph Lange via Core-talk

Re: write to a single element of an array field Ben Franksen via Core-talk

Re: write to a single element of an array field Ben Franksen via Core-talk

Re: write to a single element of an array field Ben Franksen via Core-talk

Navigate by Date:

Prev: [Merge] ~bfrk/epics-base:reformat-dbAccess into epics-base:7.0 Ben Franksen via Core-talk

Next: Re: [Merge] ~bfrk/epics-base:write-filters-rebased into epics-base:7.0 Dirk Zimoch via Core-talk

Index: 2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  2016  2017  2018  2019  <2020>  2021  2022  2023  2024 

Navigate by Thread:

Prev: Git training; was: write to a single element of an array field Torsten Bögershausen via Core-talk

Next: IOC build fails after removing an iocBoot dir from Git Konrad, Martin via Core-talk

Index: 2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  2016  2017  2018  2019  <2020>  2021  2022  2023  2024