Skip to content

Fix typo in MANIFEST.in#354

Merged
mdickinson merged 2 commits into
masterfrom
fix-manifest-in-typo
Jun 13, 2019
Merged

Fix typo in MANIFEST.in#354
mdickinson merged 2 commits into
masterfrom
fix-manifest-in-typo

Conversation

@mdickinson

Copy link
Copy Markdown
Member

recusive -> recursive

recusive -> recursive
@jwiggins

Copy link
Copy Markdown
Member

Nice catch!

@jwiggins jwiggins left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please use "Squash and Merge" since this branch contains a GitHub signed commit

@mdickinson

Copy link
Copy Markdown
Member Author

Please use "Squash and Merge" since this branch contains a GitHub signed commit

Will do, but what's the relevance of the signed commit?

@jwiggins

Copy link
Copy Markdown
Member

It makes it easier to collect merge commits when preparing a release:
git log --reverse --merges --first-parent --pretty=format:%s <last release>...master
will catch all the merge commits, but none of the squash merges.

However! We're using GitHub to manage this project, and so the vast majority of PR merges are done via GitHub (because we haven't protected the master yet branch for some reason). GitHub signs all of its commits, so they can easily be found with:
git log --reverse --pretty=format:"%G?: %s" <last release>...master | grep "^[^N]:"

@mdickinson

Copy link
Copy Markdown
Member Author

Got it. Thanks.

@jwiggins

Copy link
Copy Markdown
Member

Also, squash merges are the preferred merge strategy for this repo:

@codecov-io

codecov-io commented Jun 13, 2019

Copy link
Copy Markdown

Codecov Report

Merging #354 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #354   +/-   ##
=======================================
  Coverage   32.93%   32.93%           
=======================================
  Files         206      206           
  Lines       18290    18290           
  Branches     2414     2414           
=======================================
  Hits         6024     6024           
  Misses      11880    11880           
  Partials      386      386

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9ea8ba3...f9483d9. Read the comment docs.

@mdickinson mdickinson merged commit 57cc22b into master Jun 13, 2019
@mdickinson mdickinson deleted the fix-manifest-in-typo branch June 13, 2019 08:09
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.

3 participants