0

Explore Products

Best Sellers

New Releases

Books

Videos

Audiobooks

Free Learning

Git for Programmers

You're reading from Git for Programmers Master Git for effective implementation of version control for your programming projects

Product type Paperback

Published in Jun 2021

Publisher Packt

ISBN-13 9781801075732

Length 264 pages

Edition 1st Edition

Tools

Git

Concepts

Version Control

Author (1):

Jesse Liberty

View More author details

Table of Contents (16) Chapters

Preface

1. Introduction

2. Creating Your Repository FREE CHAPTER

3. Branching, Places, and GUIs

4. Merging, Pull Requests, and Handling Merge Conflicts

5. Rebasing, Amend, and Cherry-Picking

6. Interactive Rebasing

7. Workflow, Notes, and Tags

8. Aliases

9. Using the Log

10. Important Git Commands and Metadata

11. Finding a Broken Commit: Bisect and Blame

12. Fixing Mistakes

13. Next Steps

14. Other Books You May Enjoy

15. Index

Merging overview

If you are on a feature branch, and the feature is sufficiently complete and tested, you will want to merge your branch back into the main branch. Some organizations let you simply merge, others (most?) require that you create a Pull Request (PR). A PR says, essentially, "Please examine my code and if you think it is right, merge it into the main branch."

Having a second (or third) set of eyes on your code before merging can save a lot of headaches later on (see Chapter 12, Fixing Mistakes (Undo), on fixing mistakes).

Often, if you've been careful (see below) you will merge without a problem. From time to time, however, you will run into the dreaded merge conflict. You'll see below a couple ways to handle that conflict.

Book

You will remember from the previous chapter that we have a directory, C:\GitHub\VisualStudio\ProGitForProgrammers, that is the home of the Books application and that we've been editing in Visual Studio...

The rest of the chapter is locked

Register for a free Packt account to unlock a world of extra content!

A free Packt account unlocks extra newsletters, articles, discounted offers, and much more. Start advancing your knowledge today.

Unlock this book and the full library FREE for 7 days

Get unlimited access to 7000+ expert-authored eBooks and videos courses covering every tech area you can think of

Start free trial

Renews at €18.99/month. Cancel anytime

Authors (1)

Jesse Liberty

Jesse Liberty

Jesse Liberty is a full-time hands-on programmer, specializing in C#, git, and .NET MAUI. He hosts the popular Yet Another Podcast and is the author of more than a dozen best-selling programming books. Liberty is a Certified Xamarin Developer, a Xamarin MVP and a Microsoft MVP. He was a Technical Evangelist for Microsoft, Distinguished Software Engineer at AT&T; Software Architect for PBS and Vice President of Information Technology at Citibank, and he was on the teaching staff at Brandeis University. Jesse is a recognized expert and has spoken at conferences world-wide.

See other products by Jesse Liberty

Other recommended products

Related to this chapter

Git Version Control Cookbook

Git Version Control Cookbook

Git is one of the most popular tools for versioning. Start your journey by understanding the Git data model and discover the numerous possibilities that Git notes has to offer. You'll also get various tips and tricks for everyday usage and develop knowledge of Git providers, integrations, and clients.

Jul 2018 11h 48m

Version Control with Git and GitHub

Version Control with Git and GitHub

Version Control with Git and GitHub begins by providing you a thorough understanding of what is version control, why it's necessary, and how it lends itself to the application development and version management. With thorough explanations and interesting activities, you will learn all about optimally using Git and GitHub. By the end of this book, you will have the right skills to safeguard your application and ensure its speedy development.

Dec 2018 11h 28m

Since its inception, Git has attracted skilled developers due to its robust, powerful, and reliable features. It's incredibly fast branching ability transformed a piece of code from a niche tool for former Linux Kernel developers into a mainstream distributed versioning system. This book will help you overcome this fear and become adept in all the basic tasks in Git.

Nov 2017 7h 56m

GitHub Essentials

GitHub Essentials

GitHub is best known for bringing together developers from all around the world to discover, share, and build better software. This book starts with the basics such as building a repository and moves on to other topics like managing organizations, collaborations using GitHub workflows, and repository settings. A ready reference to all things GitHub.

Jun 2018 5h 56m

Hands-On Object-Oriented Programming with C#

Hands-On Object-Oriented Programming with C#

Object-oriented programming (OOP) is a programming paradigm organized around objects rather than actions and data rather than logic. With the newest release of C#, there are some new additions that improve Object-oriented Programming. This book teaches Object-oriented programming in C#, in an engaging and interactive way.

Feb 2019 9h 36m

Continuous Integration, Delivery, and Deployment

Continuous Integration, Delivery, and Deployment

The challenge faced by many teams while implementing continuous delivery is that it requires the use of many tools and processes that all work together. Learning and implementing all these tools (correctly) takes a lot of time and effort, leading people to wonder whether it's really worth it. This book sets up a project to show you the different steps, processes, and tools in Continuous Deployment and the actual problems they solve.

Oct 2017 15h 16m

Personalised recommendations for you

Based on your interests and search pattern

Modern Full-Stack React Projects

Modern Full-Stack React Projects

Full-Stack React Projects is a complete guide to learning full-stack web development, understanding the creation and integration of backend systems, and advancing your career as a frontend developer.

Jun 2024 16h 52m

Mastering Node.js Web Development

Mastering Node.js Web Development

Explore Node.js with practical examples that will teach you how to utilize open-source packages for real-world solutions. Gain the skills to develop and deploy server-side applications that enhance your client-side projects.

Jun 2024 25h 56m

Reactive Patterns with RxJS and Angular Signals

Reactive Patterns with RxJS and Angular Signals

This RxJS book will help you understand the core concepts of RxJS and provide practical patterns to make your code more reactive and declarative. You'll also understand Angular Signals, which provide another way to improve code reactivity.

Jul 2024 8h 28m

API Testing and Development with Postman

API Testing and Development with Postman

Whether you are a tester or a developer working with APIs, you'll be able to put your knowledge to work with this practical guide to using Postman. The book provides a hands-on approach to implementing and learning the associated methodologies that will have you up-and-running and productive in no time.

Jun 2024 11h 56m

FastAPI Cookbook

FastAPI Cookbook

This book helps you unlock the power of FastAPI to build high-performing web apps and APIs by taking you through the basics like routing and data validation through to advanced topics, such as custom middleware and WebSockets.

Aug 2024 11h 56m

Mastering Spring Boot 3.0

Mastering Spring Boot 3.0

This hands-on guide empowers you to develop scalable and efficient applications. You'll also learn microservices patterns, reactive programming, and security measures for building robust backend systems.

Jun 2024 8h 32m

Nuxt 3 Projects

Nuxt 3 Projects

This book is a comprehensive guide to Nuxt.js, which takes you from the basics to advanced topics. Uniquely, this book emphasizes practical, project-based learning, tackling real-world problems.

Jun 2024 7h 40m

Vue.js 3 for Beginners

Vue.js 3 for Beginners

Learning a new language by following video tutorials, blog posts, and documentation is a tiresome activity. This book will take you on an exciting journey of becoming a proficient Vue.js developer through a practical, step-by-step approach.

Sep 2024 10h 4m

Full-Stack Web Development with TypeScript 5

Full-Stack Web Development with TypeScript 5

The book emphasizes best practices, debugging, performance optimization, and scalable code structure, helping you develop practical skills in frontend and backend development, database integration, and AI integration.

Mastering Flask Web and API Development

Mastering Flask Web and API Development

The book is an introduction to Flask that will showcase its baseline, core, and advanced integration features to enable you to solve enterprise-related problems and issues in both web and API development.

Aug 2024 16h 28m