update module3.ipynb
This commit is contained in:
parent
1518f5a0bf
commit
a40cbfc5fb
219
module3.ipynb
219
module3.ipynb
@ -1480,28 +1480,239 @@
|
||||
"cell_type": "markdown",
|
||||
"metadata": {},
|
||||
"source": [
|
||||
"# Rebasing Your Changes"
|
||||
"# Rebasing Your Changes\n",
|
||||
"\n",
|
||||
"This reading contains the code used in the instructional videos from [**Rebasing Your Changes**<svg aria-labelledby=\"cds-react-aria3604314262-:r6gv:-title\" fill=\"none\" focusable=\"false\" height=\"16\" role=\"img\" viewBox=\"0 0 20 20\" width=\"16\" class=\"css-8blerm\" id=\"cds-react-aria3604314262-:r6gv:\"><title id=\"cds-react-aria3604314262-:r6gv:-title\">Opens in a new tab</title></svg>](https://www.coursera.org/learn/introduction-git-github/lecture/cEqbt/rebasing-your-changes)\n",
|
||||
"\n",
|
||||
"## Introduction\n",
|
||||
"\n",
|
||||
"This follow-along reading is organized to match the content in the video that follows. It contains the same code shown in the next video. These code blocks will provide you with the opportunity to see how the code is written and can be used as a reference as you work through the course.\n",
|
||||
"\n",
|
||||
"You can follow along in the reading as the instructor discusses the code or review the code after watching the video.\n",
|
||||
"\n",
|
||||
"```bash\n",
|
||||
"git checkout master\n",
|
||||
"```\n",
|
||||
"\n",
|
||||
"**Code output:** \n",
|
||||
"\n",
|
||||
"Switched to branch 'master'\n",
|
||||
"\n",
|
||||
"Your branch is up to date with 'origin/master'.\n",
|
||||
"\n",
|
||||
"```bash\n",
|
||||
"git pull\n",
|
||||
"```\n",
|
||||
"\n",
|
||||
"**Code output:** \n",
|
||||
"\n",
|
||||
"Remote: Enumerating objects: 5, done. \n",
|
||||
"\n",
|
||||
"Remote: Counting objects: 100% (5/5), done. \n",
|
||||
"\n",
|
||||
"Remote: Total 3 (delta 1), reused 3 (delta 1), pack-reused 0\n",
|
||||
"\n",
|
||||
"Unpacking objects: 10% (3/3), done. \n",
|
||||
"\n",
|
||||
"From https://github.com/redquinoa/healthchecks\n",
|
||||
"\n",
|
||||
" 58351ff..0789f64 master -> origin/master\n",
|
||||
"\n",
|
||||
"Updating 58351ff..0789f64\n",
|
||||
"\n",
|
||||
"Fast-forward\n",
|
||||
"\n",
|
||||
" README.md | 2 ++\n",
|
||||
"\n",
|
||||
" 1 file changed, 2 insertions(+)\n",
|
||||
"\n",
|
||||
"```bash\n",
|
||||
"git log \\--graph \\--oneline \\--all\n",
|
||||
"```\n",
|
||||
"\n",
|
||||
"**Code output:** \n",
|
||||
"\n",
|
||||
"\\* 0789f64 (HEAD -> master, origin/master, origin/HEAD) Add reference to all\\_checks.py to README\n",
|
||||
"\n",
|
||||
"| \\* cbee3f7 (origin/refactor, refactor) Allow printing more than one error message\n",
|
||||
"\n",
|
||||
"| \\* 75bdd43 Iterate over a list of checks and messages to avoid code duplication\n",
|
||||
"\n",
|
||||
"| \\* e914aee Create wrapper function for check\\_disk\\_full\n",
|
||||
"\n",
|
||||
"|/ \n",
|
||||
"\n",
|
||||
"\\* 58351ff Merge branch 'master' of https://github.com/redquinoa/health-checks\n",
|
||||
"\n",
|
||||
"|\\\\ \n",
|
||||
"\n",
|
||||
"| \\* a2dc118 Reorder conditional to match parameter order\n",
|
||||
"\n",
|
||||
"\\* | 03d23d0 Rename min\\_absolute to min\\_gb, use parameter names\n",
|
||||
"\n",
|
||||
"|/ \n",
|
||||
"\n",
|
||||
"| \\* 4d99c56 (origin/experimental, experimental) Empty check\\_load function\n",
|
||||
"\n",
|
||||
"|/ \n",
|
||||
"\n",
|
||||
"\\* 922d659 Add disk full check to all\\_checks.py\n",
|
||||
"\n",
|
||||
"\\* b62dc2e Add initial files for the checks\n",
|
||||
"\n",
|
||||
"\\* 807cb50 Add one more line to README.md\n",
|
||||
"\n",
|
||||
"\\* 3d9f86c Initial commit\n",
|
||||
"\n",
|
||||
"```bash\n",
|
||||
"git checkout refactor\n",
|
||||
"```\n",
|
||||
"\n",
|
||||
"**Code output:** \n",
|
||||
"\n",
|
||||
"Switched to branch 'refactor'\n",
|
||||
"\n",
|
||||
"Your branch is up to date with 'origin/refactor'.\n",
|
||||
"\n",
|
||||
"```bash\n",
|
||||
"git rebase master\n",
|
||||
"```\n",
|
||||
"\n",
|
||||
"**Code output:** \n",
|
||||
"\n",
|
||||
"First, rewinding head to replay your work on top of it...\n",
|
||||
"\n",
|
||||
"Applying: Create wrapper function for check\\_disk\\_full\n",
|
||||
"\n",
|
||||
"Applying: Iterate over a list of checks and messages to avoid code duplication\n",
|
||||
"\n",
|
||||
"Applying: Allow printing more than one error message\n",
|
||||
"\n",
|
||||
"```bash\n",
|
||||
"git log \\--graph \\--oneline\n",
|
||||
"```\n",
|
||||
"\n",
|
||||
"**Code output:** \n",
|
||||
"\n",
|
||||
"\\* f5813b1 (HEAD -> refactor) Allow printing more than one error message\n",
|
||||
"\n",
|
||||
"\\* 18257a0 Iterate over a list of checks and messages to avoid code duplication\n",
|
||||
"\n",
|
||||
"\\* e914aee Create wrapper function for check\\_disk\\_full\n",
|
||||
"\n",
|
||||
"\\* 0789f64 (origin/master, origin/HEAD, master) Add reference to all\\_checks.py to README\n",
|
||||
"\n",
|
||||
"\\* 58351ff Merge branch 'master' of https://github.com/redquinoa/health-checks\n",
|
||||
"\n",
|
||||
"|\\\\ \n",
|
||||
"\n",
|
||||
"| \\* a2dc118 Reorder conditional to match parameter order\n",
|
||||
"\n",
|
||||
"\\* | 03d23d0 Rename min\\_absolute to min\\_gb, use parameter names\n",
|
||||
"\n",
|
||||
"|/ \n",
|
||||
"\n",
|
||||
"\\* 922d659 Add disk full check to all\\_checks.py\n",
|
||||
"\n",
|
||||
"\\* b62dc2e Add initial files for the checks\n",
|
||||
"\n",
|
||||
"\\* 807cb50 Add one more line to README.md\n",
|
||||
"\n",
|
||||
"\\* 3d9f86c Initial commit\n",
|
||||
"\n",
|
||||
"```bash\n",
|
||||
"git checkout master\n",
|
||||
"```\n",
|
||||
"\n",
|
||||
"**Code output:** \n",
|
||||
"\n",
|
||||
"Switched to branch 'master'\n",
|
||||
"\n",
|
||||
"Your branch is up to date with 'origin/master'.\n",
|
||||
"\n",
|
||||
"```bash\n",
|
||||
"git merge refactor\n",
|
||||
"```\n",
|
||||
"\n",
|
||||
"**Code output:** \n",
|
||||
"\n",
|
||||
"Updating 0789f64..f5813b1\n",
|
||||
"\n",
|
||||
"Fast-forward\n",
|
||||
"\n",
|
||||
" all\\_checks.py | 24 +++++++++++++++++-----\n",
|
||||
"\n",
|
||||
" 1 file changed, 19 insertions(+), 5 deletions(-)\n",
|
||||
"\n",
|
||||
"```bash\n",
|
||||
"git push \\--delete origin refactor\n",
|
||||
"```\n",
|
||||
"\n",
|
||||
"**Code output:** \n",
|
||||
"\n",
|
||||
"Username for 'https://github.com': redquinoa\n",
|
||||
"\n",
|
||||
"Password for 'https://redquinoa@github.com': \n",
|
||||
"\n",
|
||||
"To https://github.com/redquinoa/health-checks.git\n",
|
||||
"\n",
|
||||
" - \\[deleted\\] refactor\n",
|
||||
"\n",
|
||||
"```bash\n",
|
||||
"git branch \\-d refactor\n",
|
||||
"```\n",
|
||||
"\n",
|
||||
"**Code output:** \n",
|
||||
"\n",
|
||||
"Deleted branch refactor (was f5813b1).\n",
|
||||
"\n",
|
||||
"```bash\n",
|
||||
"git push\n",
|
||||
"```\n",
|
||||
"\n",
|
||||
"**Code output:** \n",
|
||||
"\n",
|
||||
"Enumerating objects: 11, done.\n",
|
||||
"\n",
|
||||
"Counting objects: 100% (11/11), done.\n",
|
||||
"\n",
|
||||
"Delta compression using up to 4 threads\n",
|
||||
"\n",
|
||||
"Compressing objects: 100% (9/9), done.\n",
|
||||
"\n",
|
||||
"Writing objects: 100% (9/9), 1.37 KiB | 1.37 MiB/s, done.\n",
|
||||
"\n",
|
||||
"Total 9 (delta 3), reused 0 (delta 0)\n",
|
||||
"\n",
|
||||
"remote: Resolving deltas: 100% (3/3), completed with 1 local object.\n",
|
||||
"\n",
|
||||
"To https://github.com/red-quinoa/health-checks.git\n",
|
||||
"\n",
|
||||
" 0789f64..f5813b1 master -> master"
|
||||
]
|
||||
},
|
||||
{
|
||||
"cell_type": "markdown",
|
||||
"metadata": {},
|
||||
"source": [
|
||||
"# Another Rebasing Example"
|
||||
"# Another Rebasing Example\n",
|
||||
"\n"
|
||||
]
|
||||
},
|
||||
{
|
||||
"cell_type": "markdown",
|
||||
"metadata": {},
|
||||
"source": [
|
||||
"# Study guide: Conflict resolution"
|
||||
"# Study guide: Conflict resolution\n",
|
||||
"\n"
|
||||
]
|
||||
},
|
||||
{
|
||||
"cell_type": "markdown",
|
||||
"metadata": {},
|
||||
"source": [
|
||||
"# Glossary terms from module 3"
|
||||
"# Glossary terms from module 3\n",
|
||||
"\n"
|
||||
]
|
||||
},
|
||||
{
|
||||
|
||||
Loading…
Reference in New Issue
Block a user