Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reopen PR #19 #21

Conversation

peter279k
Copy link
Contributor

Changed log

@coveralls
Copy link

Coverage Status

Coverage remained the same at 95.47% when pulling 0fbab61 on open-source-contributions:enhance_travis_ci into 9f985fa on ICanBoogie:master.

@olvlvl
Copy link
Member

olvlvl commented Aug 22, 2019

GitHub is being stupid :/

@peter279k
Copy link
Contributor Author

peter279k commented Aug 22, 2019

GitHub is being stupid :/

I fix the conflicts, but I cannot squash the original commit and merged PR commits to one commit.

Maybe you can consider using this approach to merge PR when I've resolved the conflicts completely.

image

@olvlvl
Copy link
Member

olvlvl commented Aug 22, 2019

This is what I see:

image

I'm gonna apply the change a give you credit.

@peter279k
Copy link
Contributor Author

😞, @olvlvl, that's stupid again.

@peter279k peter279k closed this Aug 22, 2019
@peter279k peter279k deleted the enhance_travis_ci branch August 22, 2019 14:35
@olvlvl
Copy link
Member

olvlvl commented Aug 22, 2019

You know what? Your changes are actually merged: https://github.com/ICanBoogie/DateTime/blob/master/.travis.yml

@olvlvl
Copy link
Member

olvlvl commented Aug 22, 2019

Thanks for your contribution!

@peter279k
Copy link
Contributor Author

I know that, thanks for your effort.

peter279k pushed a commit to open-source-contributions/DateTime that referenced this pull request Aug 22, 2019
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.

None yet

3 participants