Mastering Git Source Control: Start the journey to DevOps

Event Information

Share this event

Date and Time



The Workshop Mercantile / Hub Conshy

100 Four Falls Corporate Center

Suite 104

Conshohocken, PA 19428

View Map

Event description


Git source control powers the major source control platforms from GitHub, Atlassian, and Microsoft. Your team needs to understand how it works under the hood so you can make decisions about how to work together to get the most from it.

Armed with practical knowledge of how to avoid or get out of sticky situations, you will gain an appreciation for the distributed source control system that overtook all the rest.

Source control and automated publishing is the first step on the road to DevOps, so we’ll look at three enterprise platforms: GitHub, Bitbucket, and Visual Studio Team Services.

You should have a GitHub account to work through most of the workshop. This is not a code based workshop, so developers of all languages and platforms should benefit.

(There will be some time to explore the other platforms. Optionally you may want a Bitbucket or Microsoft account. An MSDN / Visual Studio account works for this as well).

Day 1 – 8 hours (9am - 5pm) - Breakfast and Lunch Included

  • A Brief History of Git

  • Acquiring Git

  • How Git Really Works

    • Blobs, Commits, Branches, and Tags: Not what they seem?

  • Git’s “Verbs”

    • Git’s command are its actions

    • Lab Work: Using Git Commands

  • The dreaded Merge

    • Merge commits

    • Fast forward merges

    • Why is my team struggling so much with merges?

    • Lab work: Solving Git Puzzles with merges

  • Rebasing

    • Changing history

    • Cleaning up

    • The zen of rebasing and why it’s okay to love it

    • Lab work: Rebasing

  • Working with others

    • A light introduction to GitHub

    • Cloning, fetching, pushing and pulllng

    • What are remotes?

    • Lab work: Getting started with GitHub

Day 2 – 8 hours (8am - 4pm) - Breakfast and Lunch Included

    • Client Tools

      • Covering Sourcetree, GitHub Desktop, GitKraken, Tower

    • Source Control Platforms

      • Concepts unique to GitHub, BitBucket, and VSTS

      • Forks and Pull Requests

    • Enterprise platform tour

      • GitHub

      • Bitbucket

      • Visual Studio Team System

      • Lab work: Try out platforms

    • Team Patterns and Strategies

      • Our team adopted Git, and we don’t get it

      • Avoiding common pitfalls

      • Branching models

      • Git workflows

      • Managing history as a team

Chris Gomez has been developing software on Microsoft platforms for a few decades now. He has worked on diverse applications as entertainment kiosks for theme parks, analytics for commercial lending, and clinical data exchange for health care. Chris enjoys teaching new concepts, tools, and platforms to the development community and is a regular contributor to meetups and code camps in the Northeast. You can join Chris on the Static Void Podcast (www.staticvoidpodcast.com) where we discuss topics for developers at work.

Contact us with any questions or for group discounts: ModernWeb@theworkmerc.com

Free covered parking / WIFI / Refreshments. The old Hub Conshy is now the Workshop Mercantile! Conshohocken's premeire meeting and event space. Why get your workshops in an old boring hotel when you could be getting it here:

Share with friends

Date and Time


The Workshop Mercantile / Hub Conshy

100 Four Falls Corporate Center

Suite 104

Conshohocken, PA 19428

View Map

Save This Event

Event Saved