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

Minor correction to documentation #3

Merged
merged 3 commits into from Jul 25, 2017

Conversation

@LeahPrice
Copy link
Collaborator

@LeahPrice LeahPrice commented Jul 24, 2017

Correcting the description of GetParticleWeight().

Correcting the description of GetParticleWeight().
ChangeLog Outdated

* inst/include/sampler.h: Correcting the description of GetParticleWeight().

2017-07-24 Leah South <leah.south@hdr.qut.edu.au>

This comment has been minimized.

@eddelbuettel

eddelbuettel Jul 24, 2017
Collaborator

Nitwick: when one has two entries with the same data and author one tends to merge those.

But thanks for keeping up with ChangeLog!

This comment has been minimized.

@LeahPrice

LeahPrice Jul 25, 2017
Author Collaborator

Sorry are you referring to merging the entries in the ChangeLog or another type of merge? I just did a commit to remove the unnecessary ChangeLog entry.

@eddelbuettel
Copy link
Collaborator

@eddelbuettel eddelbuettel commented Jul 25, 2017

@LeahPrice You removed the entire ChangeLog entry. That is not what I suggested. I suggested to regroup all entries having the same date under the same date. Anyway....

@LeahPrice
Copy link
Collaborator Author

@LeahPrice LeahPrice commented Jul 25, 2017

@eddelbuettel Okay, thanks for clarifying that. When you said the same data and author, I misinterpreted it as the same author and general theme of the update. I removed the extra entry because it was just an error introduced in the previous change.

I've fixed this up now and combined into one.

@eddelbuettel eddelbuettel merged commit f22b045 into rcppsmc:master Jul 25, 2017
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@eddelbuettel
Copy link
Collaborator

@eddelbuettel eddelbuettel commented Jul 25, 2017

Merged. I still think you need entries for your name and email in ~/.gitconfig:

edd@brad:~$ head -3 .gitconfig
[user]
        name = Dirk Eddelbuettel
        email = edd@debian.org
edd@brad:~$

so that your commits are market as yours. Just about every git beginner's tutorial mentions this, you may have skipped it. Might be worth adding (though again I have no idea where to do this on Windows, but lots of other users seem to manage....)

@LeahPrice
Copy link
Collaborator Author

@LeahPrice LeahPrice commented Jul 25, 2017

Thanks @eddelbuettel for picking up that it didn't work. Could you please let me know where you found that quoted log that said <unknown> so I can follow it up? The Gitkraken tutorial says it happens automatically - updating my profile didn't work but surely the manual fix will.

@eddelbuettel
Copy link
Collaborator

@eddelbuettel eddelbuettel commented Jul 25, 2017

git log on the command shell. I use an alias that pretty-prints the log output (and there are many).

@LeahPrice LeahPrice deleted the LeahPrice:UpdatedComment branch Jul 26, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.