Check: Git

Knowledge check · 5 min · Module 5, lesson 6 of 65 min left in this module

Module 5 · Git essentialsLesson 6 of 6

Goal: Confirm you can make useful commits, predict what a merge will do, resolve a conflict, keep the wrong files out of a repository, and run database migrations from one place.

Four questions: three on Module 5 and one from Module 3. Every answer explains itself, right or wrong.

Your branch has two commits. Meanwhile a teammate's commit landed on main, touching a different file. What does git merge do when you merge your branch into main?
Mid-merge, greeting.js has conflict markers. You've edited it to the line you want and deleted the markers. What's next?
A teammate committed .env with a real API key last month. Today they add .env to .gitignore. Is the key safe?
From Module 3: your service runs 3 spherelets, and each one runs the database migrations as it starts. What's the risk?

Retry as often as you like.