Breaks up 01-backup.md in several topics #58
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
allowed by the lesson template and make the topics shorter.
|
We should merge or close other PRs against this lesson before landing this one... |
|
Shall I merge this now? |
iglpdc
force-pushed
the
breaking-up-01-backup
branch
from
2ce67a8
to
ab4e189
Compare
This was referenced Mar 17, 2015
|
Hey, @daisieh, there is something wrong with this merge. Some of the latest commits are missing. For example, the new paragraphs on the text editors, merged by #56, are missing in the HEAD from both the markdown and the html files. We need to check what's going on before changing more things. I may have some time later today. |
|
AUGH. |
|
I think that the problem is that the changes happened in 01-backup.md, not in 01-setup.md, so I need to manually replace the changes back to the new file. |
PBarmby
pushed a commit
to PBarmby/git-novice
that referenced
this pull request
Apr 17, 2015
… Validate link text in index.md (always), or only in headings (reference.md and instructors.md) Demote msg level when http links skipped Strip anchor from filenames in error messages
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.
Breaks the first topic of the lesson,
01-backup.md, in 5 different topics, roughly corresponding to the sections in the previous version of01-backup.md. We need this to comply with the lesson template and to avoid having really long, unstructured topics. The new files are:01-setup.md: on how to setup your laptop forgit,02-create.md: on how to create a repo withgit init,03-changes.md: on the cycle of making changes, adding, and committing,04-history.md: on exploring history and restoring older versions,05-ignore.md: on how to use.gitignore.Challenges have been moved to the end of the corresponding topic. The contents of each topic are not changed from the previous version. The rest of the topics (
collab,conflict, andopen) are renumbered appropriately. Some changes in other files are included to adapt to the new filenames. New time estimates are provided.Fixes #29 .