Challenge: Merging

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

We'll cover the following

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.

Get hands-on with 1200+ tech skills courses.