This PR recombines the branching and merging episodes, splitting out the merge conflict content into its own separate episode, as suggested by @AdrianDAlessandro.
I've added an exercise for the merge conflict episode. It's not particularly exciting -- just telling students to repeat the process again themselves, really -- but I think it's worth while having them try it themselves.
This PR recombines the branching and merging episodes, splitting out the merge conflict content into its own separate episode, as suggested by @AdrianDAlessandro.
I've added an exercise for the merge conflict episode. It's not particularly exciting -- just telling students to repeat the process again themselves, really -- but I think it's worth while having them try it themselves.