Git · Senior · Question 31 of 76
During a conflict, what are index stages 1, 2 and 3?
- 1Three past versions of the file from history
- ✓Correct answer: The merge base, our version and their version
- 3Unstaged, staged and committed versions
Explanation
git show :1:file, :2:file and :3:file print each one. Merge tools use them to show a three-way view.