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 conversion & unit tests for dgT, dtT & dsTMatrix #136

Merged
merged 11 commits into from
Jun 18, 2017
Merged

Add conversion & unit tests for dgT, dtT & dsTMatrix #136

merged 11 commits into from
Jun 18, 2017

Conversation

binxiangni
Copy link
Contributor

In order to solve #17 and #114.

@eddelbuettel
Copy link
Member

Wait, there seem to some of the same commits in both pull requests. That's generally not a great idea.

@binxiangni
Copy link
Contributor Author

Maybe I should first close this PR.

@binxiangni binxiangni closed this Jun 17, 2017
@eddelbuettel
Copy link
Member

I now merged #135. If we're careful we could probably open this and merge it too.

We can either open, and merge (maybe simplest) or cherry pick the last two commits.

In general, let's try to only work on one open PR at a time. I'm sorry I took four days on the last one but review is useful.

@eddelbuettel eddelbuettel reopened this Jun 18, 2017
@eddelbuettel
Copy link
Member

There is however a conflict now so that would have to be resolved first.

@coatless
Copy link
Contributor

Might I suggest for this PR that @eddelbuettel uses a merge squash? In essence, the working history of the branch is condensed into one commit that is added into the master. This keeps all of the changes of the PR together without adding the duplicate history from the previous PR back into the master.

Merge and squash via:

git checkout master
git merge --squash branch_here
git commit

@eddelbuettel
Copy link
Member

Yes. I already used a merge squash on the last one. Trivial from GitHub's GUI.

@coatless
Copy link
Contributor

Missed that. Awesome!

@eddelbuettel
Copy link
Member

No worries, and thanks for the CLI reminder. Noted, and copied to local README.

@eddelbuettel
Copy link
Member

Tests find on my end in a branch, so in it goes. Hurray :)

@eddelbuettel eddelbuettel merged commit ea4875f into RcppCore:master Jun 18, 2017
@binxiangni binxiangni deleted the Tsparse branch June 25, 2017 17:48
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.

3 participants