fixes conflict between next and master after PR1693 merge #1751
Conversation
[BFB] - Bit-For-Bit
|
What happened here? This is not how we usually fix this. |
|
@rljacob , I made an error in fixing the conflicts with PR#1693 which led to conflicts between next and master. @jgfouca brought it my attention on Slack through the se_cpl-group channel and suggested that the best way to remedy the issue would be though a new PR. I am also happy to revert my merge if that is the correct way to do things. This is my first time dealing with a conflict in merging. Let me know what is the best course of action and I'll go ahead and do that. |
|
I think this should only be merged to master. I get conflicts if I try to merge it to next. |
|
Ok, should I go ahead and do that now? |
|
No there are some whitespace diffs in components/clm/bld/namelist_files/namelist_defaults_clm4_5.xml that still need to be fixed. |
[BFB] - Bit-For-Bit
|
I think that fixed it, I tested by locally attempting a merge with next and did not get any conflicts. |
|
Yes I think that did it. |
|
Excellent, I'll merge to master now. |
remove untested/unused scripts in Tools directory These scripts in the Tools directory appear to be unused and are untested. Test suite: scripts_regression_tests.py Test baseline: Test namelist changes: Test status: bit for bit Fixes [CIME Github issue #] User interface changes?: Update gh-pages html (Y/N)?: Code review:mvertens
[BFB] - Bit-For-Bit