search

levylabpitt / LV-Data

Collection of LabVIEW VIs to read and write lab data.
BSD 3-Clause "New" or "Revised" License
3 stars 1 forks source link

branches #25

Closed ciozi137 closed 4 years ago

ciozi137 commented 4 years ago

@johnbrickmaier @mayabostock The branches are a hot mess (probably my fault). I will try to fix and be in touch

ciozi137 commented 4 years ago

Actually, the branch structure is ok - I think I'm just confused:

Screen Shot 2020-07-11 at 9 12 33 AM

Maybe I need to merge aws and commands into develop, and then we should branch from develop into "commands", "aws", "pg" branches for new features:

This is my goal:

Screen Shot 2020-07-11 at 9 37 21 AM

looping @phil-shenk in here too

phil-shenk commented 4 years ago

aws was just a temporary branch to help merge in the S3 stuff a while back, and can be deleted I think, unless someone has been using it. I've been branching off from 'development' into things like 'development-issue21' then merging back into development to make my changes

ciozi137 commented 4 years ago

cool thanks for confirming

ciozi137 commented 4 years ago

I think this is fixed...