Skip to main content
GitKit (VSCode Edition):
Learn git and GitHub in Context
Grant Braught, Lori Postner, Darci Burdge, Ruth Lamprecht, Stoney Jackson, Karl R. Wurst
Contents
Search Book
close
Search Results:
No results.
Prev
Up
Next
Profile
Course Home
Assignments
Practice
Peer Instruction (Instructor)
Peer Instruction (Student)
Change Course
Instructor's Page
Progress Page
Edit Profile
Change Password
Log Out
\(\newcommand{\N}{\mathbb N} \newcommand{\Z}{\mathbb Z} \newcommand{\Q}{\mathbb Q} \newcommand{\R}{\mathbb R} \newcommand{\lt}{<} \newcommand{\gt}{>} \newcommand{\amp}{&} \definecolor{fillinmathshade}{gray}{0.9} \newcommand{\fillinmath}[1]{\mathchoice{\colorbox{fillinmathshade}{$\displaystyle \phantom{\,#1\,}$}}{\colorbox{fillinmathshade}{$\textstyle \phantom{\,#1\,}$}}{\colorbox{fillinmathshade}{$\scriptstyle \phantom{\,#1\,}$}}{\colorbox{fillinmathshade}{$\scriptscriptstyle\phantom{\,#1\,}$}}} \)
Front Matter
Overview
Acknowledgements
Colophon
1
Instructor Guide
1.1
Instructor Guide Introduction
1.1.1
Quick Start
1.1.2
Adopting and Using the GitKit
1.1.3
Delivering GitKit
1.1.4
GitKit Content
1.1.5
Student Development Environments
1.1.5.1
The Kit-tty Virtual Assistant
1.1.5.2
Community Automations
1.1.6
The FarmData2 Project
1.1.7
Creating a Runestone Course using the GitKit Text
1.1.8
Doing the GitKit Yourself
1.1.9
Deploying the GitKit
1.1.10
Instructor Materials
1.1.11
Contributing to GitKit
1.2
Communities and Collaboration Instructor Notes
1.2.1
Slide Notes
1.2.2
To-Do List
1.2.3
Exercise Notes
1.3
Working Locally and Upstreaming Changes Instructor Notes
1.3.1
Slide Notes
1.3.2
To-Do List
1.3.3
Exercise Notes
1.4
Staying Synchronized Instructor Notes
1.4.1
Slide Notes
1.4.2
To-Do List
1.4.3
Exercise Notes
1.5
Merge Conflicts Instructor Notes
1.5.1
Slide Notes
1.5.2
To-Do List
1.5.3
Exercise Notes
2
Communities and Collaboration
2.1
GitKit Pre-Survey
2.2
FOSS Communities
2.2.1
FOSS Community Principles
2.2.1
2.2.2
FOSS Community Roles
2.2.2
2.3
GitHub Account
2.3
2.4
The Issue Tracker
2.4.1
Exploring the Issue Tracker
2.4.1
2.4.2
Claiming an Issue
2.4.2
2.5
Basic FOSS Workflow Concepts
2.5
2.6
Forking the Upstream Repository
2.6
2.7
Your Development Environment
2.7.1
Starting the Development Environment
2.7.1
2.7.2
Configuring the Git Client
2.7.2
2.7.3
Adjusting some GitPod Settings
2.7.3
2.7.4
Stopping your Development Environment
2.7.4
2.7.5
Re-starting your Development Environment
2.7.5
2.8
Cloning Your Origin
2.8
2.9
Extra Practice
2.9
2.10
Git Command Summary
2.10
2.11
GitKit Feedback
3
Working Locally and Upstreaming Changes
3.1
Exploring Your Local Repository
3.1
3.2
Creating a Feature Branch
3.2
3.3
Switching Branches
3.3
3.4
Editing Local Files
3.4
3.5
Staging Changes
3.5
3.6
Committing to Your Local Repository
3.6
3.7
Pushing a Branch to Your Origin
3.7
3.8
Creating a Pull Request
3.8
3.9
Git Command Summary
3.9
3.10
GitKit Feedback
4
Staying Synchronized with the Upstream
4.1
Understanding Changes to the Upstream Repository
4.1
4.2
Overview of Synchronizing with the Upstream Repository
4.3
Verifying the Upstream Remote
4.3
4.4
Pulling the Upstream
main
Branch
4.4
4.5
Pushing
main
to Your Origin
4.5
4.6
Deleting a Feature Branch
4.6
4.7
Git Command Summary
4.7
4.8
Let’s Do it Again
4.8
4.8.1.1
Claiming Another Issue
4.8.1.2
Fixing the Issue and Upstreaming Your Changes
4.9
GitKit Feedback
4.10
Appendix A
5
Handling Merge Conflicts
5.1
Understanding Merge Conflicts
5.1
5.2
Synchronizing with the Upstream Repository
5.2
5.3
Merging the main Branch into a Feature Branch
5.3
5.4
Resolving a Merge Conflict
5.4
5.5
Updating Your Pull Request
5.5
5.6
Extra Practice
5.6
5.7
Git Command Summary
5.7
5.8
GitKit Feedback
5.9
GitKit Post-Survey
5.10
Appendix A
5.10
Backmatter
Colophon
Colophon
This book was authored in PreTeXt.
