Skip to content

prefix methods for tinted image#146

Merged
minimusic merged 7 commits intomasterfrom
bugfix/121-fix-image-tint-naming
Apr 18, 2019
Merged

prefix methods for tinted image#146
minimusic merged 7 commits intomasterfrom
bugfix/121-fix-image-tint-naming

Conversation

@minimusic
Copy link
Contributor

@minimusic minimusic commented Dec 4, 2018

prefixed method; fixes #121

@ZevEisenberg ZevEisenberg changed the title fix tests for tintedImage prefix methods for tinted image Dec 4, 2018
@ZevEisenberg
Copy link
Collaborator

@minimusic looks like the commit where you actually changed the method name didn't make it into this PR!

@minimusic
Copy link
Contributor Author

I see it there... do you see two files changed? Line 24 of UIImage+Tinting.swift? Or do you just mean it doesn't show up as a separate commit? Maybe because I did the change before creating the branch? or because the first push failed?

@ZevEisenberg
Copy link
Collaborator

ZevEisenberg commented Dec 5, 2018

I was just not looking in the right place. But also, it is weird to have it in one commit that just mentions the tests. I'd fix it with

git commit --amend -m "Prefix extension method to avoid name collisions."
git push --force

(Making sure you're on the right branch first!)

@ZevEisenberg ZevEisenberg force-pushed the bugfix/121-fix-image-tint-naming branch 2 times, most recently from 0e42c51 to 70904e9 Compare December 7, 2018 16:55
@ZevEisenberg ZevEisenberg force-pushed the bugfix/121-fix-image-tint-naming branch 2 times, most recently from 52208a5 to 9c67a50 Compare December 17, 2018 18:03
@eliotw1 eliotw1 force-pushed the bugfix/121-fix-image-tint-naming branch from 9c67a50 to 07c3517 Compare March 6, 2019 21:23
@minimusic minimusic merged commit d3a8e36 into master Apr 18, 2019
@minimusic minimusic deleted the bugfix/121-fix-image-tint-naming branch April 18, 2019 21:53
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.

Xcode error when using "BonMot" pod and "Swiftilities" in one project

2 participants