Combine independent changes after branches diverge. Practise git merge <branch> in an interactive Git puzzle.
When both branches have new commits, Git can't just slide forward. It makes a merge commit that joins the two lines of work.
GitGud runs in your browser and needs JavaScript turned on to play.