4
Merging, Pull Requests, and Handling Merge Conflicts
In this chapter, you will see how to merge branches, using different types of merges. You will also see how to handle merge conflicts and tools to make managing conflicts easier. You will learn about pull requests and the difference between a fast-forward merge and a "true" merge.
In this chapter, you will learn:
- How to push a commit to the server
- How to manage your commits with the command line, Visual Studio, and GitHub Desktop
- How to merge into the main branch
- What a pull request is
- What merge conflicts are and how to resolve them
- What a fast-forward merge is
- What a true merge is
Let's start with an overview of merging.
Merging overview
If you are on a feature branch, and the feature ...
Get Git for Programmers now with the O’Reilly learning platform.
O’Reilly members experience books, live events, courses curated by job role, and more from O’Reilly and nearly 200 top publishers.
