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

'Last defined wins' style 'replace' merge #46

Closed
wants to merge 5 commits into from

Conversation

far-blue
Copy link
Contributor

As pull request #44 was sitting on my fork's master and it's not yet been accepted I've re-arranged it into a branch and re-submitted the pull request so I can work on other changes without impacting the pull request.

@far-blue
Copy link
Contributor Author

What's the general feeling on accepting this PR?

@bd808
Copy link
Member

bd808 commented Aug 12, 2015

Merged as a squashed commit in #53. Thanks for the contribution and sorry it took me so long to get around to final review.

@bd808 bd808 closed this Aug 12, 2015
@bd808 bd808 added this to the 1.3.0 milestone Aug 12, 2015
@far-blue far-blue deleted the replace-merge branch August 13, 2015 09:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

None yet

2 participants