book

Git for Programmers

Name: Git for Programmers
Author: Jesse Liberty
ISBN: 9781801075732

by Jesse Liberty

June 2021

Beginner

264 pages

4h 30m

English

Packt Publishing

Read now

Unlock full access

Preface
Who this book is forWhat this book coversTo get the most out of this bookDownload the color imagesConventions usedGet in touchShare your thoughts
Introduction
About this bookVersion controlAbout the code examplesJust a brief historyTools for working with GitGitHub, et al.GUIs and the command lineThe command lineMaking the command line prettyVisual Studio 2019Getting Visual Studio for freeGitHub DesktopGetting GitGetting Git on WindowsGetting Git on a MacGetting Git on LinuxChecking your versionConfiguring Git – the command lineConfiguring Git – Visual StudioConfiguring Git – GitHub DesktopSummary
Creating Your Repository
Creating your repositoryCreating your repository on GitHub firstCloning to your computer – command lineCloning to your computer – visual studioCloning to your computer – GitHub for DesktopCreating a projectGit pullPulling down using GitHub DesktopPulling down to Visual StudioPush me, pull youPushing to the serverDownloading the changes at the command lineDownloading the changes using GitHub DesktopStarting at the command linePulling to GitHub DesktopPulling to Visual StudioCommits – best practicesHow often should I commit?Keep your commit history cleanA note on commit messagesWhen the title isn't enoughSummary
Branching, Places, and GUIs
Five placesThe work areaThe index/staging areaSkipping the staging areaVisual StudioGitHub DesktopLocal and remote repositoriesThe stashBranchesProgrammer 1 (CommandLine) and calculatorPushing the new branchExamining originAdding commits to a branchThe Book branch – Git within Visual StudioCommitting with GitHub DesktopStatusWhat's on origin?Adding more commitsExamining your commitsSummaryChallengeAnswer
Merging, Pull Requests, and Handling Merge Conflicts
Merging overviewBookWhat's in that push?Visual StudioDetails, detailsGitHub DesktopPush it alreadyVisual StudioMerge conflictsMerging from the command lineFast forwardTrue mergeAvoiding conflictsSummaryChallengeAnswerTask #1: Set up a new repository and clone it to two different foldersTask #2: Have one person populate the main branch with the beginnings of UtilityKnife, commit the changes, and push itTask #3: Each programmer creates a feature branch. Each programmer then puts the beginning of their feature into their branch, committing frequently (more frequently than you would in "real life")Sara and the CalculatorTask #4: Merge the main branch into the feature branch frequently to ensure that if there are conflicts, you catch them earlyTask #5: John is building the temperature converter. Have him "borrow" code from the calculator. See if there are merge conflicts
Rebasing, Amend, and Cherry-Picking
RebasingHow Git does it Getting your head around itRebase early and rebase oftenRebase locally onlyRebasing in practiceSeeing the rebase at workConflictsAmendingCherry-pickingVisual Studio cherry-pickingSummaryChallengeAnswerCreating a new repository on GitHubCreating two feature branches with fake programmersFrequent rebasingAmending a commit to add a fileAmending a commit to change the messageCherry-picking one commit onto main
Interactive Rebasing
Interactive rebasing at workCreating our exampleUsing interactive rebase to clean up your commitsSummaryChallenge
Workflow, Notes, and Tags
Standard workflowMirroring your repoReplicating an existing repoAdding and showing notesTagsPointing to a different tagSummaryChallenge
Aliases
AliasesSummaryChallengeAnswer
Using the Log
Getting started with logThe LogDemo programVisual StudioGitHub Desktoplog at the command lineWhich files changed?What changed in each file?diffVisual StudioWhat changed in this file over time?SearchWhere are my commits?SummaryChallengeAnswerCreate a new repositoryAdd at least 6 commitsFind the names of every file changed in each commitFind what changed in a given file over timeFind all the files you committed in the past hour (or whatever time increment makes sense)

Important Git Commands and Metadata
StashCleanMetadataSummaryChallengeAnswer
Finding a Broken Commit: Bisect and Blame
BlameChallenge
Fixing Mistakes
You wrote the wrong message in the last commitYou forgot to add changed files from your last commitProblems with the order of commits or their messagesYou need to undo changes made in a commitYou misnamed your branchYou committed to the wrong branchYou trashed a file in a previous commitYou messed up the remote by pushing a broken branchQuizAnswersWhat do you do if you left out a changed file in the last commit?What do you do if you committed to the wrong branch?What do you do if you corrupted a file in a previous commit?What do you do if you need to undo changes made in a commit?What do you do if you trashed Master by pushing a broken branch?
Next Steps
Other Books You May Enjoy
Index

Content preview from Git for Programmers

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 ...

Become an O’Reilly member and get unlimited access to this title plus top books and audiobooks from O’Reilly and nearly 200 top publishers, thousands of courses curated by job role, 150+ live events each month,
and much more.

Read now

Unlock full access

More than 5,000 organizations count on O’Reilly

O’Reilly covers everything we've got, with content to help us build a world-class technology community, upgrade the capabilities and competencies of our teams, and improve overall team performance as well as their engagement.

Julian F.

Head of Cybersecurity

I wanted to learn C and C++, but it didn't click for me until I picked up an O'Reilly book. When I went on the O’Reilly platform, I was astonished to find all the books there, plus live events and sandboxes so you could play around with the technology.

Addison B.

Field Engineer

I’ve been on the O’Reilly platform for more than eight years. I use a couple of learning platforms, but I'm on O'Reilly more than anybody else. When you're there, you start learning. I'm never disappointed.

Amir M.

Data Platform Tech Lead

I'm always learning. So when I got on to O'Reilly, I was like a kid in a candy store. There are playlists. There are answers. There's on-demand training. It's worth its weight in gold, in terms of what it allows me to do.

Mark W.

Embedded Software Engineer

Publisher Resources

ISBN: 9781801075732

Cloud Computing

Data Engineering

Data Science

AI & ML

Programming Languages

Software Architecture

IT/Ops

Security

Design

Business

Soft Skills

Git for Programmers

by Jesse Liberty

4

Merging, Pull Requests, and Handling Merge Conflicts

Merging overview

Become an O’Reilly member and get unlimited access to this title plus top books and audiobooks from O’Reilly and nearly 200 top publishers, thousands of courses curated by job role, 150+ live events each month,
and much more.