Skip to content

Typos from Perl5 (2011 - Episode 3)#874

Merged
larsoner merged 4 commits into
codespell-project:masterfrom
Fourchaux:master
Mar 27, 2019
Merged

Typos from Perl5 (2011 - Episode 3)#874
larsoner merged 4 commits into
codespell-project:masterfrom
Fourchaux:master

Conversation

@Fourchaux
Copy link
Copy Markdown
Contributor

@Fourchaux Fourchaux commented Mar 16, 2019

@codecov-io
Copy link
Copy Markdown

codecov-io commented Mar 16, 2019 •
edited
Loading

Codecov Report

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

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #874   +/-   ##
=======================================
  Coverage   91.33%   91.33%           
=======================================
  Files           4        4           
  Lines         727      727           
  Branches      106      106           
=======================================
  Hits          664      664           
  Misses         46       46           
  Partials       17       17

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 bdafeff...f96c0a7. Read the comment docs.

@larsoner
Copy link
Copy Markdown
Member

larsoner commented Mar 19, 2019

@Fourchaux can you rebase? There is a merge conflict

@Fourchaux
Copy link
Copy Markdown
Contributor Author

Fourchaux commented Mar 20, 2019

The merge conflict is still there?

@Fourchaux
Copy link
Copy Markdown
Contributor Author

Fourchaux commented Mar 26, 2019

Is this PR problematic?
(And if so, what is the problem?)

larsoner
larsoner reviewed Mar 27, 2019
View reviewed changes
Copy link
Copy Markdown
Member

@larsoner larsoner left a comment

Choose a reason for hiding this comment

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

Just a couple minor changes, and the merge conflict is back

Comment thread codespell_lib/data/dictionary.txt Outdated
contorls->controls
contoroller->controller
contradically->contradictory
contrained->contained
Copy link
Copy Markdown
Member

@larsoner larsoner Mar 27, 2019

Choose a reason for hiding this comment

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

also constrained

Copy link
Copy Markdown
Contributor Author

@Fourchaux Fourchaux Mar 27, 2019

Choose a reason for hiding this comment

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

Done

Comment thread codespell_lib/data/dictionary.txt Outdated
opthamologist->ophthalmologist
optiional->optional
optimasation->optimization
optimation->optimisation
Copy link
Copy Markdown
Member

@larsoner larsoner Mar 27, 2019

Choose a reason for hiding this comment

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

should probably add (and prefer) optimization

Copy link
Copy Markdown
Contributor Author

@Fourchaux Fourchaux Mar 27, 2019

Choose a reason for hiding this comment

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

Done

@larsoner larsoner merged commit b8e75ec into codespell-project:master Mar 27, 2019
@arm-in
Copy link
Copy Markdown
Contributor

arm-in commented Mar 27, 2019

Pardon me for being obtrusive, but the three removals are not obvious to me. Why this?

@larsoner
Copy link
Copy Markdown
Member

larsoner commented Mar 27, 2019

I did not notice those, I agree they look like errant removals

@Fourchaux
Copy link
Copy Markdown
Contributor Author

Fourchaux commented Mar 28, 2019

Re-adding these 3 removals
with #1053

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@larsoner larsoner larsoner left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@Fourchaux @codecov-io @larsoner @arm-in