O'Reilly logo

Professional Git by Brent Laster

Stay ahead with the world's most comprehensive technology and business learning platform.

With Safari, you learn the way you learn best. Get unlimited access to videos, live online training, learning paths, books, tutorials, and more.

Start Free Trial

No credit card required

Chapter 13Understanding Remotes—Workflows for Changes

So far in this book, I’ve focused mostly on working with Git as an individual user in a local environment. In Chapter 12, I extended this discussion to interacting with the remote environment. In this chapter, I’ll focus on working with other users.

I’ll first explore the basic conflict-merge resolution workflow that comes into play when someone else has changed code you’ve also been working on. I’ll show you how this workflow works and explain why the process happens the way it does. Next, I’ll present a modified workflow that is widely used for contributing to other users’ projects. Finally I’ll discuss a strategy to help mitigate surprises when you pull updates, and fit that strategy into a larger workflow that is similar to what you might use with some other source control systems.

With Safari, you learn the way you learn best. Get unlimited access to videos, live online training, learning paths, books, interactive tutorials, and more.

Start Free Trial

No credit card required