git-course

Git workshop

Table of Contents

• Why to participate?
• Workshop targets
• What to know to enroll?
• Having workspace properly set up
• How to enroll?
• Model workshop plan
• Past workshop footage

Why to participate?

The workshop is held offline and aimed at putting hands on practical work to support participants’ learnings.

Participants are required to have learned Linux CLI and Git skills from this course modules to enroll in the workshop.

Workshop targets

Get a hands-on experience with:

• using proper git workflow
• submitting code changes by means of pull requests
• conducting code review
• approving changes and requesting changes
• resolving code conflicts

Secondary skills:

• updating feature branches from remotes and base branches
• mastering rebasing and back-up branches
• squashing commits

What to know to enroll?

• Linux CLI basics: navigating across file system, files manipulations, using command history
• Basic MarkDown syntax
• Git basics: init, clone, add, commit, checkout, branch, merge, push, pull
• Git collaboration essentials: working with remotes, forking, working with pull requests

Feel free refreshing any knowledge of the above by revisiting the course modules.

Having workspace properly set up

1. CLI editor (nano is a good choice, however any you feel comfortable with will do)
2. Git Credentials Manager installed and set up (to save time when pushing changes)
3. Command prompt tuned up for use with Git
4. Git CLI completion setup
5. Global .gitignore in your user home directory (with at least IDE specific directories listed)

Some of the items above are covered by the Udacity Version Control with Git course from Git Basics module: Mac/Linux Setup, Windows Setup.

Developer’s Environment: Git project offers a comprehensive guidance to setting up comfortable developer’s Git environment.

How to enroll?

Easy.

1. Make sure you know the theory and have some practice with git. Basically, you are expected to meet the requirements above.
2. Join related Kottans Git chat on Telegram, say ‘Hello’ and tell that you feel ready for the workshop.

Model workshop plan

Briefing

1. Get introduced to each other
2. Workshop targets
3. Check dev environment
4. Agree on Git flow conventions, branch naming and commit messaging
5. Form sub-teams for shorter mutual code review cycle

Exercise 1. Mess

1. Each contributor adds changes to a personalized file via personalized branch and opens a PR
2. PRs merged into base branch
3. Observe history mess

Exercise 2. Easy and Nice

1. Each contributor adds changes to personalized files via personalized branch (three times: to file 1, to file 2, to file 1 again)
2. Leader introduces changes
3. Each contributor in a round-robin:
   • updates their branch using rebase strategy
   • reorders and squashes their own commits
   • opens a PR
   • waits for a peer to request changes
   • updates per request
   • waits for a peer to approve changes
   • gets PR merge-squashed onto the base branch

Exercise 3. Oh, no! My code is better

1. Each contributor adds changes to a shared file via personalized branch
2. Leader introduces changes to the shared file
3. Each contributor in a round-robin:
   • updates their branch using rebase strategy
   • resolves a conflict
   • opens a PR
   • waits for a peer to approve changes
   • gets PR merge-squashed onto the base branch

Retrospection

1. Participants’ reflections
2. Feedback collection, stars and sparkles
3. FOSS contribution opportunities + Hacktoberfest/Swag

Past workshop footage

Watch one of the past workshops footage (narrated in Russian).

Git Workshop - Oleksiy Rudenko

---

Kottans git course sandbox

Course contents

This site is open source. Improve this page.