From the course: Learning Git and GitHub

Unlock this course with a free trial

Join today to access over 24,800 courses taught by industry experts.

Merge conflicts

Merge conflicts

From the course: Learning Git and GitHub

Start my 1-month free trial Buy for my team

Merge conflicts

“

- [Instructor] Every good user has to learn how to work with conflicts when working on a project. So let's practice dealing with them. Conflicts happen when you're merging two branches, but you or somebody else has made changes to the same items in a file. So for example, we can have a main branch, and then do a commit on that main branch. And then two different people can create different features. For example, we can have another user create a different fix for our project, and then merge that back into the main branch. Now, in addition to that, we could be working on our own feature branch and create a fix on our project, and then merge that back into the project. But if another fix has been made before then, that tends to cause merge conflicts. So let's take a look at how that works in our project. Now, if we take a look at the index of that HTML document, at about line 46, you'll notice that this introduction text is…

Contents