From 2850d898b0def035d8a800a88ea6f07a31371242 Mon Sep 17 00:00:00 2001 From: Cesar Herrera <29750401+CexyNature@users.noreply.github.com> Date: Tue, 29 Jan 2019 16:52:58 +1000 Subject: [PATCH 1/2] Fix symbolic link to image git_0-300dpi.png --- 3.0-branching.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3.0-branching.md b/3.0-branching.md index 69b50fe..c401014 100644 --- a/3.0-branching.md +++ b/3.0-branching.md @@ -7,7 +7,7 @@ Covered commands + concepts: Branching is a way for us to work on different features in an isolated environment. As we've talked about in this lesson, commits are repository snapshots. -![snapshots](git_0-300dpi.png) +![snapshots](images/git_0-300dpi.png) A branch is a pointer to a commit (the most recent commit in the branch history). ![branch pointer](images/git_1-300dpi.png) From d88e3e02a0fb6604ff20a73729724b02119d2868 Mon Sep 17 00:00:00 2001 From: Cesar Herrera <29750401+CexyNature@users.noreply.github.com> Date: Tue, 29 Jan 2019 17:07:33 +1000 Subject: [PATCH 2/2] Fix wording/typo in text --- 7.0-collaboration.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/7.0-collaboration.md b/7.0-collaboration.md index 3337146..93344a0 100644 --- a/7.0-collaboration.md +++ b/7.0-collaboration.md @@ -133,7 +133,7 @@ our code and make changes separately, and we can integrate those changes in our own time. Earlier we talked about `git fetch` and `get merge`. These two commands together -are `git pull`. A pull request is a request from a user for the a collaborator +are `git pull`. A pull request is a request from an user for the collaborator or organization to pull (or fetch and merge) their changes into their own repository. This is the way that we incorporate our work into another repository without commit rights. Pull requests can also be submitted on a single