woose/Introduction_to_Git_and_GitHub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update module2.ipynb

Browse Source
This commit is contained in:
Yavuz Sava 2025-03-07 13:59:58 +03:00
parent 8ba165e5eb
commit 9b47ce8ccc
1 changed files with 64 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
module2.ipynb
View File

@ -1352,7 +1352,70 @@
"metadata": {},
"source": [
"# Merging\n",
"\n"
"\n",
"This reading contains the code used in the instructional videos from [**Merging**<svg aria-labelledby=\"cds-react-aria3604314262-:r11o:-title\" fill=\"none\" focusable=\"false\" height=\"16\" role=\"img\" viewBox=\"0 0 20 20\" width=\"16\" class=\"css-8blerm\" id=\"cds-react-aria3604314262-:r11o:\"><title id=\"cds-react-aria3604314262-:r11o:-title\">Opens in a new tab</title></svg>](https://www.coursera.org/learn/introduction-git-github/lecture/InLJQ/merging)\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 branch\n",
"```\n",
"\n",
"**Code output:** \n",
"\n",
"   Even-better-feature\n",
"\n",
"\\* master\n",
"\n",
"```bash\n",
"git merge even\\-better-feature \n",
"```\n",
"\n",
"**Code output:** \n",
"\n",
"Updating 7d1de19..4361880\n",
"\n",
"Fast-forward\n",
"\n",
"  free-memory.py | 6 ++++++\n",
"\n",
"  1 file changed, 6 insertions (+)\n",
"\n",
"  Create mode 100644 free\\_memory.py\n",
"\n",
"```bash\n",
"git log\n",
"```\n",
"\n",
"**Code output:** \n",
"\n",
"Switched to branch 'master'\n",
"\n",
"commit 436188012f633b773eb6034fc02051e34da05134 (HEAD -> master, even-better-feature)\n",
"\n",
"Author: My name <me@example.com>\n",
"\n",
"Date:   Mon Jan 6 09:47:07 2020 -0800 \n",
"\n",
"     Add an empty free\\_memory.py\n",
"\n",
"commit 7d7167b2db44abf8cf014230f9b9708786e41c2a\n",
"\n",
"Author: My name <me@example.com>\n",
"\n",
"Date:   Mon Jan 6 09:15:58 2020 -0800 \n",
"\n",
"    Revert \"New name for disk\\_usage.py\"\n",
"\n",
"    Rollback reason: the previous name was actually better :)\n",
"\n",
"    This reverts commit 7d7167b2db44abf8cf014230f9b9708786e41c2a.\n",
"\n",
"(...)"
]
},
{