Indy.Code() Sessions tagged git

Git Merge, Resets and Branches

Two developers can work on the same files at the same time and it doesn't have to be scary. Git Merge makes it easy to ensure we can see what's changed, where conflicts occurred and give us an opportunity to resolve them peacefully. In general, Git provides tools for rolling files back, isolating R&D initiatives and much much more. This session will focus on some more advanced Git commands and how we can use them in our daily projects to ensure source control is never a burden but an ally in getting work done quickly, easily and without interrupting other fellow developers.

Speaker

Victor Pudelski

Victor Pudelski

V.P. of Solutions, Technology Solutions Consultants, LLC

Master Git in a Day

Unless you’ve been living under a rock, you know that git is the most popular source control management in development shops today. And for good reason; its power overshadows tools you may have used in the past, such as Subversion or Team Foundations. While most developers and companies know this, making the switch can be painful. It’s all too common to lose code or introduce bugs because of difficulties merging or resolving conflicts. But fear not - it is possible to master git, and you will after spending a day in this course. After a brief overview of git concepts and capabilities, we’ll walk through exercises with real code in pairs and groups (for a realistic team experience). We’ll resolve conflicts, squash commits, stomp on other people’s code, fix our mistakes, introduce bugs (and then use git to find them), tag our commits, and more. All exercises will be performed on the command line, so you’ll truly understand what’s happening without the aid of GUI-based tools.

PS Don’t get your head detached about working in pairs and groups! We put the “fun” in “git fundamentals” with name tags, snacks, frequent breaks, and background music. No kumbaya or trust falls required.

Speaker

Lyndsey Padget

Lyndsey Padget

Founder & Software Engineer, Longplay Software

Push it (Push it Real Good)

Git. It can be intimidating if you're accustomed to other kinds of source control management. Even if you're already using it and comfortable with the basics, situations can arise where you wish you understood it better. Developers often just want to write code and tell everyone else to take a hike, but the reality is that most of us work on teams where the feature-based code we write must be integrated, tested, and ultimately released. This session will cover the most critical git concepts, basic and advanced, in a completely visualized way. At the same time, you’ll pick up git terminal commands to help you understand (or even eliminate) a git GUI you already use. Go beyond the basics to learn how to get yourself out of a git pickle, practical release management strategies, and more.

Speaker

Lyndsey Padget

Lyndsey Padget

Founder & Software Engineer, Longplay Software

Git Demystified!

Git is a lot simpler than it looks.

Everything in a Git repository is based on just three fundamental types of objects: blobs, trees, and commits. Once you understand what these are and how they relate to each other, the apparent complexity of Git melts away revealing a simple, elegant system that is powerful because it is simple.

In this talk, we'll look under the covers of Git to see what is actually in a git repository on disk and what happens when you enter git commands like git commit. You'll come away with a better understanding of how Git really works and greater confidence in using Git.

Note: This is not an introduction to Git or a "how to" tutorial. You'll get more out of this talk if you have at least a little familiarity with Git, even (or perhaps especially) if you're struggling to get Git.

Speaker

David Body

David Body

President, Big Creek Software, LLC