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

Join Rasbats and SaltyPaws repositories (Windows & Linux)? #25

Open
rgleason opened this issue Mar 22, 2018 · 2 comments
Open

Join Rasbats and SaltyPaws repositories (Windows & Linux)? #25

rgleason opened this issue Mar 22, 2018 · 2 comments

Comments

@rgleason
Copy link
Collaborator

rgleason commented Mar 22, 2018

Dear Walter,
I don't know if you have responded to Mike, but I hope you will let us know what you want to do about this. Mike has spent time and effort figuring out how to make your plugin work completely in Windows, which is wonderful.
He recognizes that the two versions would be best if joined into one repository.
We hope you will do that and let us know.

Best
Rick

@rgleason rgleason changed the title Join Rasbats and SaltyPaws repositories (Windows & Linux) Join Rasbats and SaltyPaws repositories (Windows & Linux)? Mar 22, 2018
@SaltyPaws
Copy link
Owner

I am all for this. I did not see the request. How do I take action on this?

@rgleason
Copy link
Collaborator Author

rgleason commented Mar 29, 2018

I am not quite sure how to procede, Mike had made a PR and I noticed some conflicts so I tried to make a PR that would resolve some of the conflicts and it caused a problem, so I had to change that PR to make it work, and in the end it did not get merged I think.

Maybe Mike has some good ideas how to achieve this.

I think it is possible for you to make a PR from Mike's repository yourself by comparing the two repositories saltypaws/calculator_pi - master <--- rasbats/calculator_pi - master
like this https://github.com/SaltyPaws/calculator_pi/compare/master...Rasbats:master?expand=1

and I can see there are going to be conflicts again that need to be resolved by someone.
We know rasbats version works with windows, also he has fixed a number of the functions so they work. Someone knowledgeable will need to review each of the changes and accept them or not.

I would be happy to try to compile and test the result.

PS. I think Rasbats version also works in linux does it not Mike?

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

No branches or pull requests

2 participants