Experimental Physics and
Industrial Control System

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

Attachment: pEpkey.asc
Description: application/pgp-keys

Replies:

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

Re: write to a single element of an array field Timo Korhonen via Core-talk

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

Navigate by Date:

Prev: Re: [Merge] ~bfrk/epics-base:write-filters into epics-base:7.0 Ben Franksen via Core-talk

Next: Build failed: EPICS Base base-7.0-565 AppVeyor 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: Re: write to a single element of an array field Johnson, Andrew N. via Core-talk

Next: Git training; was: write to a single element of an array field Torsten Bögershausen 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