Branches and merging
Comes up in: Recruiter screen
This concept is being written. It gets the full five steps — explanation, predict, interview angle, practice with tests, and review cards. Here is exactly what it will cover, so you can study it elsewhere in the meantime.
What it covers
- branches as pointers
switch/checkout- merge (fast-forward vs merge commit)
- merge conflicts and how to resolve them
- HEAD
Words you will know
What you will practise
- create and resolve a conflict (worked → independent)
Interview questions this answers
- How do you resolve a merge conflict?
- How would you undo a commit that is already pushed to a shared branch?