Skip to content

Commit

Permalink
Add extra slides detailing git commands for walkthrough
Browse files Browse the repository at this point in the history
  • Loading branch information
owap committed Aug 9, 2016
1 parent 13434cb commit 02f590a
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 7 deletions.
10 changes: 7 additions & 3 deletions crash_course.md
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,13 @@ Now, we're going to cover the following:

1. Navigate to your local repository
2. Make sure you're on a new branch (my-branch) with the latest from upstream
3. Open `classlist.md` for editing
4. Add your name to the class list
5. `git commit -p`
3. Open `index.html` or `resources/generator.js`
4. Create an enhancement to the project (add a noun, adjective, or some other feature)
5. `git status`
6. `git diff`
7. `git add -p`
8. `git diff --cached`
9. `git commit`

There is lot of literature online for writing [great commit messages](http://chris.beams.io/posts/git-commit/)

Expand Down
37 changes: 33 additions & 4 deletions slides.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ One-way Data Flow
---
```
git fetch upstream
git checkout upstream/develop
git branch my-new-branch
git checkout my-new-branch
git checkout upstream/master
git branch my-feature
git checkout my-feature
```
---
*Branches*
Expand Down Expand Up @@ -90,14 +90,43 @@ Now:
+ Pull Requests
+ Merge Conflicts
---
*Edit:*
```
index.html
resources/generator.js
```
---
Committing
---
+ `git status`
+ `git diff`
+ `git add -p`
+ `git diff --cached`
+ `git commit`
---
Submitting
---
+ `git push origin my-feature`
+ [github.com/OpenWhere/git-lesson](github.com/OpenWhere/git-lesson)
+ Follow on-screen prompts to create Pull Request
---
Pull Requests
---
+ Review Code *again*
+ Write Descriptive Title
+ Add helpful description (screenshots!)
---
Code Reviews
---
Merge Conflicts
---
+ `git fetch upstream`
+ `git branch` (verify correct branch)
+ `git merge upstream/master`
+ Resolve conflicts
+ `git commit -a`
+ `git push origin my-feature`
---
# Questions?
---
# Thanks!
# *Thanks!*

0 comments on commit 02f590a

Please sign in to comment.