search

carpentries-incubator / hpc-intro

An Introduction to High Performance Computing
https://carpentries-incubator.github.io/hpc-intro/
Other
142 stars 141 forks source link

adding examples on 17-resources.md #397

Closed tameek closed 2 years ago

tameek commented 2 years ago

Adding example code blocks for top, and Htop commands

tkphd commented 2 years ago

Hi @tameek, thank you for contributing back to HPC Intro! Unfortunately, the NESI-specific branch you're requesting that we pull from has diverged from this "upstream" repository, and we cannot merge it. If the wrong branch was selected, please edit this PR and fix it so we can review. Otherwise, you might have to make a separate clone of this repository, create a new branch off of its gh-pages branch, and copy your changes in before issuing a new PR. Please let us know if we can help sort this out.

tameek commented 2 years ago

@tkphd Ok, thanks.

tkphd commented 2 years ago

Hi @tameek, @CallumWalley, et al., If the goal is still to merge this PR, please attend tomorrow's Coordination Meeting to discuss how the differences might be reconciled. Otherwise, please close this, since it can not be merged with the history of the gh-pages-nesi branch. Thanks!

tkphd commented 2 years ago

Closing, as the gh-pages-nesi branch has diverged too far from our gh-pages to make merging it feasible.