search

paulscherrerinstitute / StreamDevice

EPICS Driver for message based I/O
GNU General Public License v3.0
28 stars 42 forks source link

2.8.16 not on branch #62

Closed LeeHudsonDLS closed 3 years ago

LeeHudsonDLS commented 3 years ago

Hi, I would like to merge the latest release onto our master branch but I see that this tag wasn't made on a branch that currently exists (or perhaps it's a local one). Was this intentional? Thanks Lee

dirk-zimoch commented 3 years ago

When I had started on 2.8, i had used a branch "2-8" and had 2.7 on "master". Later I renamed the old "master" to "2-7" and "2-8" to "master" Only later I noticed that this is a problem when you had the old "master" checked out. Sorry, I am no git expert. I cannot tell you how to solve that problem.

LeeHudsonDLS commented 3 years ago

OK no worries, i'm not sure what the solution is either apart from me merging that commit directly. Even when I do a fresh clone it's still showing 2.8.16 as not being on a branch. I don't know if you can checkout that commit locally, merge into master then push?

dirk-zimoch commented 3 years ago

I pushed again. Maybe I did something wrong last time. My git showd me that only the commit before 2.8.16 had been pushed. I wonder how then the tag 2.8.16 could have been there. Anyway, now 2.8.17 is pushed.

LeeHudsonDLS commented 3 years ago

Ah thanks that seems to have gotten it, thanks!