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

add Windows testing #43

Merged
merged 2 commits into from
Apr 20, 2017
Merged

add Windows testing #43

merged 2 commits into from
Apr 20, 2017

Conversation

mschilli87
Copy link
Collaborator

see #36 & #42

@mschilli87
Copy link
Collaborator Author

@retaj: Why the merge? The tests are still failing aren't they?
Now I cannot re-base on dev anymore until it's fixed upstream.
Also, the badge was still missing.
That's why Iabled this WIP and assigned myself. 😉

@retaj
Copy link
Collaborator

retaj commented Apr 21, 2017

I have no idea what happened here 🐙 😱 🙀

@mschilli87 mschilli87 mentioned this pull request Apr 21, 2017
@mschilli87
Copy link
Collaborator Author

I created a new dev2 branch which is basically dev without this merge.
I re-created this PR as #44 targeting the new branch and I updated #40 & #42 to target the new branch.
So theoretically (if you agree), we can delete the dev branch and use dev2 from now on (until the next merge to master).

@mschilli87
Copy link
Collaborator Author

@retaj: I rebased dev and re-targeted all PRs. So when all tests are through I'll remove dev2 again. Sorry for the force-push to dev but it seemed like the cleanest solution to me.
Let me know if this breaks anything locally for you and I'll help you re-base/merge everything into dev again. 😉

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

Successfully merging this pull request may close these issues.

2 participants