Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu ...
Transcript of Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu ...
![Page 1: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/1.jpg)
Web Programming with Python and JavaScript
![Page 2: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/2.jpg)
Git
![Page 3: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/3.jpg)
git
![Page 4: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/4.jpg)
a = 1 b = 2 c = 3
Create file
Keep track of changes to code.
![Page 5: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/5.jpg)
a = 1 b = 2 c = 3
a = 1 b = 2 c = 3 d = 4
Create file Add a line
Keep track of changes to code.
![Page 6: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/6.jpg)
a = 1 b = 2 c = 3
a = 1 b = 2 c = 3 d = 4
a = 1 c = 3 d = 4
Create file Add a line Remove a line
Keep track of changes to code.
![Page 7: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/7.jpg)
b = 2 c = 3b = 2 c = 3b = 2 c = 3
Synchronizes code between different people.
![Page 8: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/8.jpg)
b = 2 c = 3
b = 2 c = 3
b = 2 c = 3
Synchronizes code between different people.
![Page 9: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/9.jpg)
b = 2 c = 3
a = 1 b = 2 c = 3
b = 2 c = 3 d = 4
a = 1 b = 2 c = 3
b = 2 c = 3 d = 4
Synchronizes code between different people.
![Page 10: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/10.jpg)
int b = 2; int c = 3; int d = 4;
int a = 1; int b = 2; int c = 3;
a = 1 b = 2 c = 3 d = 4
a = 1 b = 2 c = 3
b = 2 c = 3 d = 4
a = 1 b = 2 c = 3 d = 4
a = 1 b = 2 c = 3 d = 4
Synchronizes code between different people.
![Page 11: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/11.jpg)
int b = 2; int c = 3; int d = 4;
int a = 1; int b = 2; int c = 3;
a = 1 b = 2 c = 3 d = 4
int a = 1; int b = 2; int c = 3;
int b = 2; int c = 3; int d = 4;
a = 1 b = 2 c = 3 d = 4
a = 1 b = 2 c = 3 d = 4
Synchronizes code between different people.
![Page 12: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/12.jpg)
int a = 1; int b = 2; int c = 3; int d = 4;
a = 1 b = 2 c = 3 d = 4
a = 1 b = 2 c = 3
Test changes to code without losing the original.
![Page 13: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/13.jpg)
a = 1 b = 2 c = 3
a = 1 b = 2 c = 3 d = 4
a = 1 b = 2 c = 3 d = 4
Test changes to code without losing the original.
![Page 14: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/14.jpg)
a = 1 b = 2 c = 3
a = 1 b = 2 c = 3 d = 4
a = 1 b = 2 c = 3 d = 4
Test changes to code without losing the original.
![Page 15: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/15.jpg)
a = 1 b = 2 c = 3
a = 1 b = 2 c = 3 d = 4
a = 1 c = 3 d = 4
Create file Add a line Remove a line
Revert back to old versions of code.
![Page 16: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/16.jpg)
a = 1 b = 2 c = 3
a = 1 b = 2 c = 3 d = 4
Create file Add a line
Revert back to old versions of code.
![Page 17: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/17.jpg)
GitHub
![Page 18: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/18.jpg)
git clone
![Page 19: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/19.jpg)
git clone <url>int b = 2; int c = 3; int d = 4;
int a = 1; int b = 2; int c = 3;
int a = 1; int b = 2; int c = 3; int d = 4;
int a = 1; int b = 2; int c = 3; int d = 4;
int a = 1; int b = 2; int c = 3; int d = 4;
a = 1 b = 2 c = 3 d = 4
![Page 20: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/20.jpg)
git clone <url>
git clone <url>
int b = 2; int c = 3; int d = 4;
int a = 1; int b = 2; int c = 3;
int a = 1; int b = 2; int c = 3; int d = 4;
int a = 1; int b = 2; int c = 3; int d = 4;
a = 1 b = 2 c = 3 d = 4
a = 1 b = 2 c = 3 d = 4
![Page 21: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/21.jpg)
git clone <url>int b = 2; int c = 3; int d = 4;
int a = 1; int b = 2; int c = 3;
int a = 1; int b = 2; int c = 3; int d = 4;
int a = 1; int b = 2; int c = 3; int d = 4;
a = 1 b = 2 c = 3 d = 4
a = 1 b = 2 c = 3 d = 4git clone <url>
![Page 22: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/22.jpg)
git add
![Page 23: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/23.jpg)
git add <filename>int b = 2; int c = 3; int d = 4;
int a = 1; int b = 2; int c = 3;
int a = 1; int b = 2; int c = 3; int d = 4;
int a = 1; int b = 2; int c = 3; int d = 4;
a = 1 b = 2 c = 3 d = 4
a = 1 b = 2 c = 3 d = 4
![Page 24: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/24.jpg)
git add <filename>int b = 2; int c = 3; int d = 4;
int a = 1; int b = 2; int c = 3;
int a = 1; int b = 2; int c = 3; int d = 4;
int a = 1; int b = 2; int c = 3; int d = 4;
a = 1 b = 2 c = 3 d = 4
a = 1 b = 2 c = 3 d = 4 e = 5
![Page 25: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/25.jpg)
git add <filename>
git add foo.py
a = 1 b = 2 c = 3 d = 4 e = 5
int b = 2; int c = 3; int d = 4;
int a = 1; int b = 2; int c = 3;
int a = 1; int b = 2; int c = 3; int d = 4;
int a = 1; int b = 2; int c = 3; int d = 4;
a = 1 b = 2 c = 3 d = 4
![Page 26: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/26.jpg)
git add <filename>
Changes to be committed:
modified: foo.py
git add foo.py
a = 1 b = 2 c = 3 d = 4 e = 5
int b = 2; int c = 3; int d = 4;
int a = 1; int b = 2; int c = 3;
int a = 1; int b = 2; int c = 3; int d = 4;
int a = 1; int b = 2; int c = 3; int d = 4;
a = 1 b = 2 c = 3 d = 4
![Page 27: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/27.jpg)
git commit
![Page 28: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/28.jpg)
int a = 1; int b = 2; int c = 3; int d = 4;
git commit -m "message"int b = 2; int c = 3; int d = 4;
int a = 1; int b = 2; int c = 3;
int a = 1; int b = 2; int c = 3; int d = 4;
int a = 1; int b = 2; int c = 3; int d = 4;
a = 1 b = 2 c = 3 d = 4
a = 1 b = 2 c = 3 d = 4 e = 5
![Page 29: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/29.jpg)
git commit -m "message"
git commit -m "Add line"
int b = 2; int c = 3; int d = 4;
int a = 1; int b = 2; int c = 3;
int a = 1; int b = 2; int c = 3; int d = 4;
int a = 1; int b = 2; int c = 3; int d = 4;
a = 1 b = 2 c = 3 d = 4
a = 1 b = 2 c = 3 d = 4
a = 1 b = 2 c = 3 d = 4 e = 5
![Page 30: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/30.jpg)
git commit -m "message"
git commit -m "Add line"
a = 1 b = 2 c = 3 d = 4
Add line
int b = 2; int c = 3; int d = 4;
int a = 1; int b = 2; int c = 3;
int a = 1; int b = 2; int c = 3; int d = 4;
int a = 1; int b = 2; int c = 3; int d = 4;
a = 1 b = 2 c = 3 d = 4
a = 1 b = 2 c = 3 d = 4 e = 5
![Page 31: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/31.jpg)
git status
![Page 32: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/32.jpg)
git status
Add line
int b = 2; int c = 3; int d = 4;
int a = 1; int b = 2; int c = 3;
int a = 1; int b = 2; int c = 3; int d = 4;
int a = 1; int b = 2; int c = 3; int d = 4;
a = 1 b = 2 c = 3 d = 4
a = 1 b = 2 c = 3 d = 4 e = 5
a = 1 b = 2 c = 3 d = 4
![Page 33: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/33.jpg)
git status
git status Add line
int b = 2; int c = 3; int d = 4;
int a = 1; int b = 2; int c = 3;
int a = 1; int b = 2; int c = 3; int d = 4;
int a = 1; int b = 2; int c = 3; int d = 4;
a = 1 b = 2 c = 3 d = 4
a = 1 b = 2 c = 3 d = 4 e = 5
a = 1 b = 2 c = 3 d = 4
![Page 34: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/34.jpg)
git status
a = 1 b = 2 c = 3 d = 4 e = 5
git status
a = 1 b = 2 c = 3 d = 4
Add line
On branch master Your branch is ahead of 'origin/master' by 1 commit. (use "git push" to publish your local commits)
int b = 2; int c = 3; int d = 4;
int a = 1; int b = 2; int c = 3;
int a = 1; int b = 2; int c = 3; int d = 4;
int a = 1; int b = 2; int c = 3; int d = 4;
a = 1 b = 2 c = 3 d = 4
![Page 35: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/35.jpg)
git push
![Page 36: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/36.jpg)
git pushint a = 1; int b = 2; int c = 3; int d = 4;
int b = 2; int c = 3; int d = 4;
int a = 1; int b = 2; int c = 3;
int a = 1; int b = 2; int c = 3; int d = 4;
a = 1 b = 2 c = 3 d = 4
int a = 1; int b = 2; int c = 3; int d = 4; int e = 5;
Add line
a = 1 b = 2 c = 3 d = 4 e = 5
Add line
a = 1 b = 2 c = 3 d = 4
![Page 37: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/37.jpg)
git pushint a = 1; int b = 2; int c = 3; int d = 4;
int b = 2; int c = 3; int d = 4;
int a = 1; int b = 2; int c = 3;
int a = 1; int b = 2; int c = 3; int d = 4;
a = 1 b = 2 c = 3 d = 4
a = 1 b = 2 c = 3 d = 4 e = 5
git push
Add line
a = 1 b = 2 c = 3 d = 4 e = 5
Add line
a = 1 b = 2 c = 3 d = 4
![Page 38: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/38.jpg)
git pushint a = 1; int b = 2; int c = 3; int d = 4;
int b = 2; int c = 3; int d = 4;
int a = 1; int b = 2; int c = 3;
int a = 1; int b = 2; int c = 3; int d = 4;
a = 1 b = 2 c = 3 d = 4 e = 5
git push
Add line
a = 1 b = 2 c = 3 d = 4 e = 5
Add line
a = 1 b = 2 c = 3 d = 4
a = 1 b = 2 c = 3 d = 4
![Page 39: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/39.jpg)
git pull
![Page 40: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/40.jpg)
git pull
a = 1 b = 2 c = 3 d = 4 e = 5
Add line
a = 1 b = 2 c = 3 d = 4 e = 5
Add line
a = 1 b = 2 c = 3 d = 4
a = 1 b = 2 c = 3 d = 4
int a = 1; int c = 3; int d = 4; int e = 5;
Remove line
a = 1 c = 3 d = 4 e = 5
Remove line
![Page 41: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/41.jpg)
git pull
git pull
Add line
Add line
a = 1 c = 3 d = 4 e = 5
Remove line
a = 1 c = 3 d = 4 e = 5
Remove line
a = 1 b = 2 c = 3 d = 4
a = 1 b = 2 c = 3 d = 4 e = 5
a = 1 b = 2 c = 3 d = 4
a = 1 b = 2 c = 3 d = 4 e = 5
![Page 42: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/42.jpg)
git pull
git pull
Add line
Add line
a = 1 c = 3 d = 4 e = 5
Remove line
a = 1 c = 3 d = 4 e = 5
Remove line
a = 1 b = 2 c = 3 d = 4
a = 1 b = 2 c = 3 d = 4 e = 5
a = 1 b = 2 c = 3 d = 4 e = 5
a = 1 b = 2 c = 3 d = 4
![Page 43: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/43.jpg)
Merge Conflicts
![Page 44: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/44.jpg)
Merge Conflicts
![Page 45: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/45.jpg)
Merge Conflicts
git pull
![Page 46: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/46.jpg)
Merge Conflicts
git pullCONFLICT (content): Merge conflict in foo.py Automatic merge failed; fix conflicts and then commit the result.
![Page 47: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/47.jpg)
Merge Conflicts
git pull
a = 1 <<<<< HEAD b = 2 ===== b = 0 >>>>> 57656c636f6d6520746f20576562 c = 3 d = 4 e = 5
foo.c
![Page 48: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/48.jpg)
Merge Conflicts
git pull
a = 1 <<<<< HEAD b = 2 ===== b = 0 >>>>> 57656c636f6d6520746f20576562 c = 3 d = 4 e = 5
foo.c
your changes
remote changes
conflicting commit{{
![Page 49: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/49.jpg)
Merge Conflicts
git pull
a = 1 <<<<< HEAD b = 2 ===== b = 0 >>>>> 57656c636f6d6520746f20576562 c = 3 d = 4 e = 5
foo.c
![Page 50: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/50.jpg)
Merge Conflicts
git pull
a = 1
b = 2
c = 3 d = 4 e = 5
foo.c
![Page 51: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/51.jpg)
Merge Conflicts
git pull
a = 1 b = 2 c = 3 d = 4 e = 5
foo.c
![Page 52: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/52.jpg)
git log
![Page 53: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/53.jpg)
git log
![Page 54: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/54.jpg)
git log
git log
![Page 55: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/55.jpg)
git log
git log
commit 436f6d6d6974204d73672048657265 Author: Brian Yu <[email protected]> Date: Tue Jan 14 14:06:28 2020 -0400
Remove a line
commit 57656c636f6d6520746f20576562 Author: Brian Yu <[email protected]> Date: Tue Jan 14 14:05:28 2020 -0400
Add a line
![Page 56: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/56.jpg)
git reset
![Page 57: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/57.jpg)
git reset
a = 1 b = 2 c = 3 d = 4 e = 5
- git reset --hard <commit> - git reset --hard origin/master
Add line
a = 1 b = 2 c = 3 d = 4
a = 3 c = 3 d = 4 e = 5
Remove line57656c6 436f6d6
![Page 58: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/58.jpg)
git reset
a = 1 b = 2 c = 3 d = 4 e = 5
Add line
a = 1 b = 2 c = 3 d = 4
a = 3 c = 3 d = 4 e = 5
Remove line
git reset --hard 57656c6
57656c6 436f6d6
- git reset --hard <commit> - git reset --hard origin/master
![Page 59: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/59.jpg)
git reset
a = 1 b = 2 c = 3 d = 4 e = 5
git reset --hard 57656c6
Add line
a = 1 b = 2 c = 3 d = 4
57656c6
- git reset --hard <commit> - git reset --hard origin/master
![Page 60: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/60.jpg)
Making Changes
![Page 61: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/61.jpg)
first commit
![Page 62: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/62.jpg)
first commit
changes
![Page 63: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/63.jpg)
first commit
changes more changes
![Page 64: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/64.jpg)
first commit
changes more changes
start new feature
![Page 65: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/65.jpg)
first commit
changes more changes
start new feature
keep working on new feature
![Page 66: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/66.jpg)
Branching
![Page 67: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/67.jpg)
first commit
![Page 68: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/68.jpg)
first commit
changes
![Page 69: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/69.jpg)
first commit
changes more changes
![Page 70: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/70.jpg)
first commit
changes more changes
start new feature
![Page 71: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/71.jpg)
first commit
changes more changes
start new feature
keep working on new feature
![Page 72: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/72.jpg)
first commit
changes more changes
start new feature
keep working on new feature
fix bug
![Page 73: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/73.jpg)
first commit
changes more changes
start new feature
keep working on new feature
fix bug
← master
← feature
![Page 74: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/74.jpg)
first commit
changes more changes
start new feature
keep working on new feature
fix bug
← master
← feature
← HEAD
![Page 75: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/75.jpg)
first commit
changes more changes
start new feature
keep working on new feature
fix bug
← master
← feature ← HEAD
![Page 76: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/76.jpg)
first commit
changes more changes
start new feature
keep working on new feature
fix bug
![Page 77: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/77.jpg)
first commit
changes more changes
start new feature
keep working on new feature
fix bug merge
![Page 78: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/78.jpg)
Branching
• git branch
• git checkout
• git merge
![Page 79: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/79.jpg)
Remotes
![Page 80: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/80.jpg)
Remotes
![Page 81: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/81.jpg)
Remotes
↑
master
↑
master
![Page 82: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/82.jpg)
Remotes
↑
master
git fetch
↑
master
![Page 83: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/83.jpg)
Remotes
↑
master
↑
master
git fetch
origin/master↑
![Page 84: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/84.jpg)
Remotes
↑
master
↑
master
git fetch
git merge origin/master
origin/master↑
![Page 85: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/85.jpg)
Remotes
↑
master
↑
master
git fetch
git merge origin/master
origin/master↑
![Page 86: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/86.jpg)
Remotes
↑
master
↑
master
git pull
origin/master↑
![Page 87: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/87.jpg)
Forks
![Page 88: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/88.jpg)
Pull Requests
![Page 89: Web Programming - CS50 · git log git log commit 436f6d6d6974204d73672048657265 Author: Brian Yu Date: Tue Jan 14 14:06:28 2020 -0400 Remove a line](https://reader033.fdocuments.in/reader033/viewer/2022050106/5f442e95676d563b1b7418b4/html5/thumbnails/89.jpg)
Web Programming with Python and JavaScript