-
Notifications
You must be signed in to change notification settings - Fork 56
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 dgR, dtR & dsRMatrix #139
Conversation
I think you are doing something wrong. You have not pulled or merged or ... the master branch. Most of these commits here we already accounted for. That is not in and by itself a big problem, it's just that we could do this more elegantly. |
It is worth trying one or two things with git. You can rename your current RcppArmadillo working directory and copy of the repo -- say, The create a fresh checkout. That corresponds to our master branch here. Then try to get both aligned. You should be able to the the 'working' copy (ie 'previous' above) to just about the same set of commits -- differing only by your new commits made since I merged the branch. |
Next time around, run See Atlassian's Git Rebasing for more. |
Why rebase and not just merge? The language about 'new commits' tends to confuse me because I do want the existing commits, not the old changes recommitted as new ones. I think what I do in such a case is to
But this is git so there are probably half a dozen ways... |
That looks much better 💯 |
Looks really good. Two quick questions:
Where is that? Does it need a attribution in the file header (i.e. something like 'Portions taken from file abc.py written by D, E and F and released under copyright G' ?)
|
You can look at the reference here. If attribution can be added, that would be great. It can be "Portions taken from file csr.h written by SciPy developers and released under Copyright 2017 SciPy developers. "(?) I only find that on their website.
|
All good. |
All merged. @binxiangni can you maybe write a short note at each of e #17 and #114 and close them, if appropriate, now that this is merged? |
In order to solve #17 and #114. And there is a piece of codes using the algorithm from scipy. I have added a reference to that. What else should I do to avoid violating the copy rights? @coatless @eddelbuettel @thirdwing
Btw, I squash and merge a branch called Rsparse to the master, but now the commit history still shows up here. I know the reason might be that I didn't squash and merge the previous commits, which leads to a messy timeline. :(