Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added introductory notebook (first draft) with cosyne tutorial included #7

Merged
merged 2 commits into from
Apr 1, 2022

Conversation

thesamovar
Copy link
Contributor

@thesamovar thesamovar commented Mar 31, 2022

Fixes #4

@thesamovar
Copy link
Contributor Author

@synek can you quickly check this merge won't mess with yours and then go ahead and merge it in?

@thesamovar thesamovar requested a review from rorybyrne March 31, 2022 17:31
@rorybyrne
Copy link
Contributor

rorybyrne commented Mar 31, 2022

Even though it's the same directory structure, the two PRs would conflict because they each have a different lineage of commits! But if you change this PR to point to my branch (instead of main), then it should work and we can merge it into my branch.

(We call this "stacking PRs" in the industry - usually you want to avoid it, but sometimes it's necessary when one PR is blocking others)

So instead of main <- thesamovar, it'll be rory/structure <- thesamovar.

@rorybyrne
Copy link
Contributor

(you do it by clicking the edit button up at the title of the PR)

@thesamovar
Copy link
Contributor Author

OK I'm going to make a few other changes quickly separately and let's deal with that tomorrow.

@rorybyrne rorybyrne changed the base branch from main to rory/structure April 1, 2022 13:51
@rorybyrne rorybyrne merged commit 7eb9206 into rory/structure Apr 1, 2022
@rorybyrne rorybyrne deleted the thesamovar branch April 1, 2022 13:52
rorybyrne added a commit that referenced this pull request Apr 1, 2022
* wip: adds some basic open-source structure

* fix: title in PR template

* devops: adds some dependencies (hopefully correctly)

* fix: used the right venv for generating requirements.txt

* wip: rename ssl/ to spikeloc/

* fix: ssl -> spikeloc in other files

* added introductory notebook (first draft) with cosyne tutorial included (#7)

* added introductory notebook (first draft) with cosyne tutorial included

* added some background

Co-authored-by: Dan Goodman <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add the cosyne notebook to get things started
2 participants