All Products

Best Sellers

New Releases

Books

Videos

Audiobooks

Free Learning

Git for Programmers

You're reading from Git for Programmers

Product type Book

Published in Jun 2021

Publisher Packt

ISBN-13 9781801075732

Pages 264 pages

Edition 1st Edition

Languages

Concepts

Author (1):

Jesse Liberty

Table of Contents (16) Chapters

Preface

1. Introduction

2. Creating Your Repository

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 $15.99/month. Cancel anytime}

Authors (1)

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.

Read more

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 11 hours 48 minutes

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 11 hours 28 minutes

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 7 hours 56 minutes

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 5 hours 56 minutes

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 9 hours 36 minutes

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 15 hours 16 minutes

Personalised recommendations for you

Based on your interests and search pattern

Modernizing Drupal 10 Theme Development

Modernizing Drupal 10 Theme Development

Modernizing Drupal 10 Theme Development covers everything a frontend developer or a Drupal developer needs to know about the Drupal 10 theme layer. Using real-world examples, this book will help you to build up from an empty theme to a fast, responsive, maintainable, and accessible Drupal website in both monolithic and decoupled ways.

Aug 2023 12 hours 0 minutes

Full Stack Development with Spring Boot 3 and React

Full Stack Development with Spring Boot 3 and React

Full Stack Development with Spring Boot 3 and React contains a wealth of practical guidance for picking up full stack development. The step-by-step exploration of everything from dependency injection, ORM with Hibernate, and JWTs to RESTful APIs, UI styling, and TypeScript will help you to develop the Spring Boot and React skills you need.

Oct 2023 15 hours 8 minutes

Modern API Development with Spring 6 and Spring Boot 3

Modern API Development with Spring 6 and Spring Boot 3

This practical guide teaches inexperienced Java programmers and web developers how to design, develop, test, and deploy highly scalable and maintainable APIs using REST, gRPC, GraphQL, and reactive programming paradigms with Java and Spring Boot. Complete with real-world examples, it will guide you to build enterprise-level APIs and services.

Sep 2023 16 hours 28 minutes

Hands-On Web Scraping with Python

Hands-On Web Scraping with Python

This book guides you to discover and extract quality data from the web using Python libraries such as requests, lxml, pyquery, scrapy, and to use effective scraping techniques. It’ll help you master the fundamentals and advanced concepts of web scraping and apply your skills to real-world data extraction tasks, with analysis and visualization.

Oct 2023 10 hours 48 minutes

Mastering Blazor WebAssembly

Mastering Blazor WebAssembly

Mastering Blazor WebAssembly is a comprehensive, practical guide that’ll help you to develop advanced web applications. By combining real-world experience with the thorough knowledge needed to build Blazor apps in a masterful fashion, this book enables you to efficiently manage cross-platform mobile development with .NET MAUI and Blazor.

Aug 2023 12 hours 20 minutes

Mastering Blazor WebAssembly

Mastering Blazor WebAssembly

Mastering Blazor WebAssembly is a comprehensive, practical guide that’ll help you to develop advanced web applications. By combining real-world experience with the thorough knowledge needed to build Blazor apps in a masterful fashion, this book enables you to efficiently manage cross-platform mobile development with .NET MAUI and Blazor.

Aug 2023 12 hours 20 minutes

Full Stack Web Development with Remix

Full Stack Web Development with Remix

Unlock the power of the web platform and cutting-edge technologies for your React applications using Remix to take advantage of the full stack to create a great user experience. This book is a complete resource covering the conventions, levers, and primitives of Remix and illustrates concepts through a real-world project.

Nov 2023 10 hours 36 minutes

Real-World Svelte

Real-World Svelte

This book is a must-have guide to unlocking Svelte's true potential. You’ll learn about advanced component development, efficient coding, and powerful UI patterns using actions. With a focus on state management, custom stores, and renderless components, this book equips you to build exceptional web apps with lightning-fast performance.

Dec 2023 9 hours 24 minutes

Building Micro Frontends with React 18

Building Micro Frontends with React 18

This book is a step-by-step guide to building production-grade, highly scalable, and performant web apps using multi-SPA and micro apps patterns, where you’ll learn to deal with complexities related to micro frontends. The book is a full life cycle guide to building, deploying, and managing micro frontends in a cloud-native environment.

Oct 2023 7 hours 16 minutes

Drupal 10 Masterclass

Drupal 10 Masterclass

This all-in-one guide helps you get up and running with building Drupal applications using the latest Drupal 10 features. You’ll develop a complete practical understanding of Drupal frontend, backend, architecture, content management, themes, and modules to deliver a rich user experience by creating custom Drupal apps.

Dec 2023 10 hours 20 minutes

Full-Stack Flask and React

Full-Stack Flask and React

This book teaches you how to build simple yet efficient production-ready web applications. Starting with an introduction to React, this book will equip you with deeper knowledge of Flask and React technology stacks to undertake web application development with confidence.

Oct 2023 13 hours 36 minutes

Full-Stack Flask and React

Full-Stack Flask and React

This book teaches you how to build simple yet efficient production-ready web applications. Starting with an introduction to React, this book will equip you with deeper knowledge of Flask and React technology stacks to undertake web application development with confidence.

Oct 2023 13 hours 36 minutes