Merge changes from W2019 collab

barbaLab / nigeLab

Neurophysiological data analyses by engineers, for physiologists.

GNU General Public License v3.0

14 stars 2 forks source link

Merge changes from W2019 collab #54

Closed m053m716 closed 4 years ago

m053m716 commented 4 years ago

Bring changes from W2019 collaboration from dev into master branch.

m053m716 commented 4 years ago

I am not sure that Master is in a working state as it currently stands. Going to squash and merge using local master.

m053m716 commented 4 years ago

Something weird going on with the .githook to merge with master, looks like it may be something internal with github / git-lfs ( see here and here ).

I made a new branch ( main ) from dev and swapped that to be the default. I think we probably just move forward by discarding master?

m053m716 commented 4 years ago

I'm closing this due to the headaches with host key authentication etc. there were some issues preventing a neat merge. However, this was merged into dev already and I'll issue a new features pull request so you can look at that one instead.