A stress-free environment for learning how to merge Unity files.

1. Easy challenges
   • Two objects created on the same line
   • Object created on the same line as object deleted
   • Decimals nearly the same
   • Easy Medley
2. Medium challenges
   • Files renamed at the same time
   • Folder moved at the same time as file edited/added
   • Object order shuffling
   • Two branches added a layer at the same time
   • Medium Medley 1
   • Medium Medley 2
3. Hard challenges
   • Object slicing - Git thinks just the ID changed
   • Prefab in scene: Scene-only sub-objects
   • Hard Medley 1
   • Hard Medley 2

Each challenge represents a problem (or set of problems) you are likely to encounter when doing real development work. You can do the single-problem challenges in any order, but the medleys build on each other.

When finished, each has a tool inside of Unity where you can check your work. On the top menu, click "Learn Unity Merging" and then click "Verify (challenge name)".

Scenario: After having set up the player prefab, the team's programmer then went to implement camera control. At the same time, the artist added the character model and animations. Your task: merge same-line-add/player-art into same-line-add/main

Scenario: The team's designer made a blockout. The character artist has replaced placeholder NPCs with their models, but the environment artist has fleshed out the level and merged that into main first. Your task: merge same-line-add-remove/level-art into same-line-add-remove/main

Scenario: The designer has been tweaking the location of NPCs, and the artist has been tweaking the location of props. Your task: merge decimals-similar/props into decimals-similar/main

Scenario: The team's designer has been tuning values and tweaking object placement. Your task: merge medley-easy/design-tweaks into medley-easy/main Hint: If you're not certain what changes should be kept, take a look at the commit messages!

Hint: If you're not certain what changes should be kept, take a look at the commit messages!

Hint: If you're not certain what changes should be kept, take a look at the commit messages! They'll tell you a lot... but maybe not everything.

Hint: If you're not certain what changes should be kept, take a look at the commit messages! They'll tell you a lot... but maybe not everything.

Hint: If you're not certain what changes should be kept, take a look at the commit messages! Some will be helpful, and some won't... but it's a start.