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

Testing documentation update. #43

Merged
merged 6 commits into from
Dec 2, 2017
Merged

Testing documentation update. #43

merged 6 commits into from
Dec 2, 2017

Conversation

dabail10
Copy link
Contributor

@dabail10 dabail10 commented Dec 2, 2017

Developer(s): D. Bailey
Updated documentation (Y/N): Y
Results (bit for bit, roundoff, climate changing): bfb
Code review: E. Hunke, A. Roberts
Other Relevant Details:
The Makefile is still working with my software stack. There are still some tweaks in the txt files
that I will work on, but overall the RST is close here.

@eclare108213
Copy link
Contributor

Have these changes already been merged in previous PRs? I don't know why there would be changes from 16 days ago still here. Dave, I'm wondering if you're not updating your fork after previous PRs and/or creating new PRs when you could just add to older ones that haven't been satisfied yet. ??

@dabail10
Copy link
Contributor Author

dabail10 commented Dec 2, 2017

Well, I did a pull from CICE-Consortium master. I'm a bit (git?) confused about why the pull requests seem to pull in more than I expected. It's like they are cumulative when previous PRs are not satisfied maybe?

@eclare108213
Copy link
Contributor

I don't think it hurts to merge previous stuff again, it just makes the repo history hard to follow. I'm not sure if any of this in PR#43 is redundant, actually -- what's confusing me is that the commit labels are very similar between this branch (master) and the PR#42 branch (gh-pages). I request that commit labels be a bit more specific in the future, thanks.

@eclare108213
Copy link
Contributor

I think that when you update your fork, git will pull in things that you previously committed, but they don't show up as potential changes to commit. I could be wrong about that.

@eclare108213 eclare108213 merged commit 544223b into CICE-Consortium:master Dec 2, 2017
JFLemieux73 pushed a commit to JFLemieux73/CICE that referenced this pull request Nov 30, 2021
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.

2 participants