Challenge: Merging

Test your understanding of “merging” by completing the following challenge.

We'll cover the following

Problem statement
Solution

Problem statement#

Initialize a repository, commit a file, make changes on two branches, and merge. Create a merge knowing there will be a conflict and understand what you need to do to resolve it.

Solution#

Click the “Show Solution” button to learn about the solution.

Handling Merge Conflicts

Introduction: Git Stash

Mark as Completed

Report an Issue

Before We Begin

Introduction to Git

Git Basics

Clone a Repository

Git Branching

Merging

Git Stash

Git Add Interactive

Reflog

Cherry Picking

Git Rebase

Git Bisect

Fetching and Pulling Content

Working With Multiple Repositories

Pushing Code

Git Submodules

Pull Requests

Git Log

Squashing Commits

Bare Repositories

Cherry-Picking and Three-Way Merges

Git Hooks

Conclusion

Challenge: Merging

Problem statement#

Solution#