Rewrite rebase vs merge analogy #1481
Merged
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.
A reader opened issue #351, saying that the rebase vs merge analogy used was not clear.
I tried my hand at rewriting this part. I hope this is better than what we had before.
git clone
to get the history, and figure out how to usegit log
to read the history, then trawl trough 1000 commits, and find what you need to do." 😄Merging this pull-request fixes #351.