Add Viewer support#648
Conversation
|
As an example of our new commit paradigm, discussed on E3SM-Project/zstash#355: On https://github.com/E3SM-Project/zppy/pull/648/commits we initially had 4 commits: The second commit is really just an extension of the 1st. The 4th commit resets the auto-generated tests that were included in the 3rd commit. So really we can squash these down to 2 commits: git checkout issue-601-viewers
# This part is unnecessary, but I like to create a backup branch in case I mess something up
git checkout -b issue-601-viewers-until-20250114
git checkout issue-601-viewers # Switch back
git log
# Find last commit before the commits in the PR
git rebase -i 69fe79dd718832f52d7a0fae31c0257b9ee70915
# Change the two extra commits to `f` for fixup (a type of squash)
# pick 37cb030 Add Viewer support
# f 7c5e2b8 Update extra vars and make_viewer
# pick ee60560 Use updated nco for zi input
# f 20aa769 Reset tests
git log
# Now, there are 2 commits instead of 4After merging #654, we have some merge conflicts to deal with too: git fetch upstream main
git rebase upstream/main
git status # See the unmerged pathsIn Change to: In Change to: (Remove git grep -n "<<<" zppy
# No more diffs
git add zppy/defaults/default.ini zppy/templates/global_time_series.bash
git rebase --continue |
20aa769 to
d2e5bd9
Compare
|
#654 removed |


Issue resolution
zppy-interfacesPR: Add Viewer support zppy-interfaces#9Select one: This pull request is...