K.E. Koziar

Hi, @mwakok. Will you clarify your proposal? I'm not sure what you are stating in your opening paragraphs. In terms of a structure, I'm partial to the one proposed by...

@esmesh, thanks for the feedback. We are always looking to improve the lesson. Can you clarify the diagram you're referring to in [episode 9](http://swcarpentry.github.io/git-novice/09-conflict/index.html)? The only diagram in that episode...

> I think I was referring to adding something like the episode 9 diagram into the episode 8 "Basic Collaborative Workflow" section - for consistency and so the the episode...

Thanks for the feedback. Someone added the text > (Again, we’ll edit with nano and then cat the file to show its contents; you may use a different editor, and...

@lo5an will you verify that this message is still produced, and under what conditions? Since the lesson does not delve into branches, it seems out of scope. Also, I cannot...

If you don't mind, I'm going to put a "wait" tag on this. It looks like there are still [PRs and discussion](https://github.com/git/git/search?q=pull.rebase%3Dfalse&type=issues) about this and the various `git pull` options...

I understand the need to solve this. As a new instructor, it was frustrating to see in carpentry lessons times that don't match lesson content (e.g. 30 minutes teaching listed...

> What about combining the info in the lesson with the instructor's guide (which in my opinion is underused - if this is a word)? I like this idea, and...

Cross-reference https://github.com/swcarpentry/git-novice/pull/767

Thanks for linking the wiki, @tobyhodges . I'll submit a PR.