Merge upstream changes #2
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
the PR was missing the last `git restore` needed to put `mars.txt` back in the state at the beginning of the episode (before the ill-considered change)
As I followed along, the $ git diff HEAD~3 is back one commit further than my history. It is possible if a previous aside is followed that this might not generate an error about that version not existing, however, the output shown indicates no such commit. So the command is inconsistent with the output shown. A simple fix is to replace the "3" with a "2"
Add descriptive alt text to all images
Update Workflows to Version 0.16.5
Further warnings in rm exercise
Update README.md with new lesson template
Stress the importance of `git status` (swcarpentry#685)
Incorrect number of commits before head for shown output.
In episode 5, mention that both `git log` and `git show` display IDs that can identify commits.
Fix syntax with alt text
…itlog Mention both git log and git show (swcarpentry#875)
Explain no feedback in typing passphrases
Update Citation
Fix "second big question"
Updated screenshot of collaborators
…h_restore change the use of git checkout to git restore
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merging changes from https://github.com/swcarpentry/git-novice