Class notes about training-manual

[amyschoen]

I've often wondered about the placement of local git config as well. We've run into trouble in class with config there and had to jump ahead to give students guidance around fixing their issues.

I like how they do reverting commits. Mostly because bisect is fun. 😀 That was one of the cool new things I picked up during my instructor training.

[brianamarie]

Hi @coachnate 👋

I'm wondering if there is anything we can address here, or if you were still planning on adding a bit more detail to these notes? Let me know how we can help. 😊

[coachnate]

Sorry for the stale issue. At some point, I'd like to contribute a change that looks at reordering some of the content in a more fluid manner. Has anyone else played with reordering the agenda in other ways?

I ran a class over the last two days and (unintentionally) did quite a bit of reordering of the first day. The second day we mostly followed the script.

[TheNotary]

I have a branch that attempts to improve the flow of things, though I still am not 100% happy with things. I will try to link to it this morning.

[TheNotary]

• https://gist.github.com/TheNotary/78e0f5e6060659e471b836cbcce87355
• https://gist.github.com/TheNotary/ae1a419f87b35106442e615287ff19a8
• https://gist.github.com/TheNotary/8b1eb84be1189b9e46ec8580779cf545
• https://gist.github.com/TheNotary/ab95888321cc4ef1d4bd31ba77e4ac32
• https://gist.github.com/TheNotary/b2ed6867d32a95a246dc742254b6f79a

[TheNotary]

Update: See #182

[amyschoen]

@TheNotary, our work version of FF is old and oddly customized. Use chrome instead.

[TheNotary]

Ok, I'll give that a try when I get home, I've got 2 factor configured on this account so it's tricky getting logged in without the right devices around.

Regarding the patches, I found that they aren't applying cleanly because our fork re-ordered things to have Git discussed first and then GitHub a long while ago. @amyschoen, do you have a workflow for syching back changes like that to here? If you could do that, I think I can get these patches to apply cleanly.

[amyschoen]

I did things like remove the Japanese version from our manual and changed most of the GitHub references to GitHub Enterprise, so there's no good way to sync cleanly. I just clone both and then manually port changes between them.

[TheNotary]

I manually merged in my reorder meanderings to this branch here: #182

Is it possible that you took a similar approach with your re-ordering, @coachnate? I noticed that the github explanation and git explanation were in the same massive file, so I split them to prevent merge conflicts from arising, which sadly, will likely lead to some pretty nasty merge conflicts.