FIX #66 - made a clean version of the EEG-only branch#75
Merged
robertoostenveld merged 1 commit intobids-standard:bep006_eegfrom Apr 25, 2018
Merged
Conversation
Collaborator
Author
|
Hi @chrisfilo, are you OK with me merging this? |
Closed
Collaborator
Author
|
this is a clean commit that only involves new files (for an EEG-only version), hence I'll move ahead and merge. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I manually extracted all additions related to ds000117_eeg_only and copied them over in an (otherwise clean) branch. This should resolve the merge conflict in #66 and adds the EEG-only example using EEGLAB format data files.
@CPernet I recommend that you don't use you master branch for development, but rather send PRs from a dedicated development branch. Although this PR resolves merge, I leave it to you to to clean up your own master (which will have a lot of conflicts). You may want to delete your local and your github copy of the BIDS-examples repository and start all over with a new fork.