Getting Started with Git

Aug 14 2023 · git 2.28, console

Part 1: Getting Started with Git

05. Merge Changes

Episode complete

Play next episode

Next
About this episode

Leave a rating/review

See forum comments
Cinema mode Mark complete Download course materials
Previous episode: 04. Create a Branch Next episode: 06. Create a Pull Request

Get immediate access to this and 4,000+ other videos and books.

Take your career further with a Kodeco Personal Plan. With unlimited access to over 40+ books and 4,000+ professional videos in a single subscription, it's simply the best investment you can make in your development career.

Learn more Already a subscriber? Sign in.

Heads up... You’re accessing parts of this content for free, with some sections shown as obfuscated text.

Heads up... You’re accessing parts of this content for free, with some sections shown as obfuscated text.

Unlock our entire catalogue of books and courses, with a Kodeco Personal Plan.

Unlock now

In the last video, you saw how to push your changes to your branch. If you open up your repository, you can see that because you are on the “Carnitas Tacos Recipe” branch, you have the Carnitas Tacos recipe. Switch to the main branch. This branch does not have the commit you created on the “Carnitas Tacos Recipe” branch. Open up the repo. You can see here that, just like what’s shown in the GitHub app, you don’t have the “carnitas-tacos.txt” file for the Carnitas Tacos recipe.