chore: merge master into modernize-minian (resolve README conflict)#322
Merged
Conversation
add logo to readme
# Conflicts: # README.md
Codecov Report✅ All modified and coverable lines are covered by tests. 📢 Thoughts on this report? Let us know! |
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
3 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.
What
Merges
masterintomodernize-minianto clear the README merge conflict blocking #301.masterhad advanced by one logo PR (#253:add logo to repo/add logo to readme) thatmodernize-miniandidn't have, and both branches edited the README header, so #301 wentCONFLICTING.Conflict resolution
The README header conflict was resolved to keep both improvements:
img/minian_logo.png, now also pulled in)miniscope/minianbadge URLs (master still pointed at the oldDeniseCaiLaborg; the rest of the README already usesminiscope)No other files conflicted; the only other change is the new
img/minian_logo.pngbinary.Why a separate PR
modernize-minianis a protected branch (changes must go through a PR + required checks), so the merge can't be pushed to it directly. Merging this intomodernize-minianbrings in master's logo and makes #301 mergeable.