"Actually Using Git": Better roadmap

[jadrian]

On tutorials/actually-using-git/lessons/conflicting-branches.md, Ibrahim mentioned that the framing wasn't clear. We need a little bit more text to explain to a reader where they're headed.