GitHub notes

If you have tips for other IDEMS developers, related to Git or GitHub, then you can add them to this page.

Be aware that GitHub does not generate notification emails for emojis

@lloyddewit 05/10/21

If you respond to a GitHub comment with just an emoji, then GitHub will not send a notification email. Therefore, if you want somebody to be informed about your comment, then it's best to tag them (e.g. @developerName) and add a text comment.

How to remove files from a PR

@lloyddewit 02/08/21

In R-Instat PR #6557, some files had been accidentally changed and added to the PR. We needed to roll back these files to the state they were in when the PR was first branched. This effectively removes the changed files from this PR. In case anyone else ever needs to do anything similar, I added my personal notes below:

• In Visual Studio (notes based on Visual Studio 16.10.4)
  • Ensure that you are in local master
  • Go to Git changes tab
    • Pull from upstream (to ensure that Master has the latest commits)
    • Note: you should normally also push to origin at this point to keep your GitHub fork up-to-date
  • Go to GitHub tab
    • Checkout the PR
  • Go to solution explorer tab
    • Right mouse button on solution file, select open in file explorer
• In file explorer
  • Right mouse button Git Bash from here
• In Git Bash
  • Find the commit that the PR branch forked from
    • $ git merge-base --fork-point master
    • ace8d37e6665513f12a7afc0c70b1c2185b4af20
  • Check out, from the fork commit, all the files that you wish to roll back
    • $ git checkout ace8d37e6665513f12a7afc0c70b1c2185b4af20 -- dlgImportDataset.vb dlgNewDataFrame.vb dlgOpenNetCDF.vb dlgVisualizeData.vb ucrFilePath.vb
  • Note: If '--fork-point' does not work then you can use the branch name instead, e.g.:
    • git merge-base master pr/6558-french-translation-updates-prepare-menu-up-to-view-labels-levels
• In Visual Studio
  • Go to Git changes tab
    • Commit and push the changed files
• In GitHub
  • Go to the PR
  • Click on the files changed tab
  • The files you wanted to roll back should have disappeared from the list of changed files