mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-07-12 07:34:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Issue #126 remove usage of upstream and downstream

Browse source
This commit is contained in:
Peter Cottle 2013-09-27 20:39:32 -07:00
parent cfea67ecce
commit 2f9437cbb2
10 changed files with 86 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/levels/intro/merging.js
View file

@ -44,7 +44,7 @@ exports.level = {
"We will `merge` the branch `bugFix` into `master`"
],
"afterMarkdowns": [
"Woah! See that? First of all, `master` now points to a commit that has two parents. If you follow the arrows upstream from `master`, you will hit every commit along the way to the root. This means that `master` contains all the work in the repository now.",
"Woah! See that? First of all, `master` now points to a commit that has two parents. If you follow the arrows up the commit tree from `master`, you will hit every commit along the way to the root. This means that `master` contains all the work in the repository now.",
"",
"Also, see how the colors of the commits changed? To help with learning, I have included some color coordination. Each branch has a unique color. Each commit turns a color that is the blended combination of all the branches that contain that commit.",
"",
@ -61,7 +61,7 @@ exports.level = {
"Let's merge `master` into `bugFix`:"
],
"afterMarkdowns": [
"Since `bugFix` was downstream of `master`, git didn't have to do any work; it simply just moved `bugFix` to the same commit `master` was attached to.",
"Since `bugFix` was an ancestor of `master`, git didn't have to do any work; it simply just moved `bugFix` to the same commit `master` was attached to.",
"",
"Now all the commits are the same color, which means each branch contains all the work in the repository! Woohoo!"
],