Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix GitHub render of linked images and in-repo file sections #714

Closed
wants to merge 5 commits into from
Closed

Fix GitHub render of linked images and in-repo file sections #714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
83f018f
fix episode 01 in-repo image links
diaorch Jan 7, 2020
29801ae
fix type in fig path names
diaorch Jan 7, 2020
62bebdc
experiment combining relative link to file and anchor together
diaorch Jan 7, 2020
6669e67
test html anchor id for linking from episode 01
diaorch Jan 7, 2020
193ec3d
add html anchor id to the keyword `repository` after testing on `commit`
diaorch Jan 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions _episodes/01-basics.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ to keep track of what one person did and when.
Even if you aren't collaborating with other people,
automated version control is much better than this situation:

[![Piled Higher and Deeper by Jorge Cham, http://www.phdcomics.com/comics/archive_print.php?comicid=1531]({{ page.root }}/fig/phd101212s.png)](http://www.phdcomics.com)
[![Piled Higher and Deeper by Jorge Cham, http://www.phdcomics.com/comics/archive_print.php?comicid=1531](../fig/phd101212s.png)](http://www.phdcomics.com)

"Piled Higher and Deeper" by Jorge Cham, http://www.phdcomics.com

Expand All @@ -35,26 +35,26 @@ think of it as a recording of your progress: you can rewind to start at the base
document and play back each change you made, eventually arriving at your
more recent version.

![Changes Are Saved Sequentially]({{ page.root }}/fig/play-changes.svg)
![Changes Are Saved Sequentially](../fig/play-changes.svg)

Once you think of changes as separate from the document itself, you
can then think about "playing back" different sets of changes on the base document, ultimately
resulting in different versions of that document. For example, two users can make independent
sets of changes on the same document.

![Different Versions Can be Saved]({{ page.root }}/fig/versions.svg)
![Different Versions Can be Saved](../fig/versions.svg)

Unless multiple users make changes to the same section of the document - a conflict - you can
incorporate two sets of changes into the same base document.

![Multiple Versions Can be Merged]({{ page.root }}/fig/merge.svg)
![Multiple Versions Can be Merged](../fig/merge.svg)

A version control system is a tool that keeps track of these changes for us,
effectively creating different versions of our files. It allows us to decide
which changes will be made to the next version (each record of these changes is
called a [commit]({{ page.root }}{% link reference.md %}#commit)), and keeps useful metadata
called a [commit](../reference.md#commit)), and keeps useful metadata
about them. The complete history of commits for a particular project and their
metadata make up a [repository]({{ page.root }}{% link reference.md %}#repository).
metadata make up a [repository](../reference.md#repository).
Repositories can be kept in sync across different computers, facilitating
collaboration among different people.

Expand Down
4 changes: 2 additions & 2 deletions reference.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ changeset
to a single [commit](#commit) in a [version control](#version-control)
[repository](#repository).

commit
<a id=commit>commit</a>
: To record the current state of a set of files (a [changeset](#changeset))
in a [version control](#version-control) [repository](#repository). As a noun,
the result of committing, i.e. a recorded changeset in a repository.
Expand Down Expand Up @@ -48,7 +48,7 @@ remote
: (of a repository) A version control [repository](#repository) connected to another,
in such way that both can be kept in sync exchanging [commits](#commit).

repository
<a id=repository>repository</a>
: A storage area where a [version control](#version-control) system
stores the full history of [commits](#commit) of a project and information
about who changed what, when.
Expand Down