Sync rel/1.2.1 to master#302
Merged
franklin-feingold merged 64 commits intorel/1.2.1from Aug 14, 2019
Merged
Conversation
Co-Authored-By: Oscar Esteban <code@oscaresteban.es>
update 7/25
Co-Authored-By: Chris Markiewicz <effigies@gmail.com>
Co-Authored-By: Chris Markiewicz <effigies@gmail.com>
Co-Authored-By: Chris Markiewicz <effigies@gmail.com>
confirmed all authors of MEG, EEG, and iEEG papers are contributors.
added a git clone to set up git
[INFRA] Transpose the entity table and link to text anchors describing each entity
* origin/master: [DOC] Auto-generate changelog entry for PR #272 Apply suggestions from code review reorder sections as chris suggested STY: Move to passive voice/imperative mood consistent use of <label> Apply suggestions from code review right align cells and formtting add general section on entities fix linter some cleanup/clarifying try links via tiny headings try fix links try links transpose entity table
[INFRA+FIX] Use linkchecker (from a dedicated docker image) to check all URLs
FIX: repair link in anatomical MRI table
revert clone instructions; instead point out requirements
Co-Authored-By: Kirstie Whitaker <kw401@cam.ac.uk>
[ENH] BEP Update
[ENH] Clarify requirements in Release Protocol
[ENH] Adding Contributors and updating contributions
Collaborator
|
@franklin-feingold Why not just: git fetch upstream
git checkout rel/1.2.1
git merge upstream/master
git push |
Collaborator
Author
|
It seemed like it is merging in too, is there a difference? I was on the GUI so doing this seemed easier |
Collaborator
|
The main difference is now this will be in the changelog. |
Collaborator
Author
|
I can delete the entry right now (at least for stable), for latest it will reappear. next release I'll do cli |
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
4 participants
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.
No description provided.