Git workshop Simple

Table of Contents

• Introduction
• Woodstock
• Creating and handling merge conflicts
• References

Introduction

This is a simple sample repository to demonstrate Git, handling of merge conflicts, and how to make tyops.

Note	Kevin might be late to this workshop. In that case, enjoy the lessons contained in this sample repository about how to write words good.

Woodstock

Tweet tweet tweet.

Creating and handling merge conflicts

• We’re going to create merge conflicts in this repository during the workshop. This is intended, and is aprt of why there are numerous typos and a decent array of self-referential metahumor.

To create some conflicts:

1. Make some form of change to thi sfile and commit your changes. Once everyone has made some kind of change and committed it, we’ll update this file remotely.

2. Once the file has been updated, try pulling the new changes:

   $ git pull

3. You should encounter merge conflicts because I’ll probably change every line of this file in some way or another. Well, most of the lines. You’ll see what I mean.

4. This wlil give us the opportunity to work through the merge conflicts during the workshop and hopefully end up with a much nicer repository whuch makes more sesne and doesn’t look quite as unprofessional.

Note	This repository will probably still look kind of unprofessional.

References

A lot of the information that we’ll be going over today is also documented in my Avoiding Merge Conflicts (robin-owen/avoiding-merge-conflicts) repository on GitHub.