K.E. Koziar

Text editor information is included because if someone executes `git commit` with no `-m` and message, the text editor which is associated with git will open, prompting a commit message....

@Maaike74, the way it is currently worded, it reinforces that merge conflicts often occur when the local repository isn't updated from the remote prior to pushing local changes to the...

@zingale git restore is [still experimental](https://git-scm.com/docs/git-restore)

I'm adding statuses "blocked" and "Refer to Curriculum Advisory Committee" because right now the features of `restore` and `switch` are still listed as experimental. As much as I would love...

I think `git fetch` is starting to go into _intermediate_ territory, which is _out of scope_ for a novice lesson. Maybe if this were a full-day lesson, but since it...

@edbennett Thanks for the comment. It sounds like what you're describing is [collaborating](http://swcarpentry.github.io/git-novice/08-collab/index.html), but where different lines of the same file are modified at the same time. However, there is...

I just want to address the changing folders aspect of this, not the bad example of file/folder names: When I first taught the lesson, I thought it was pretty ridiculous...

@mlell This is an interesting concept. I wonder if it's more suited for a [data carpentry](https://datacarpentry.org/) workshop, since workflows will be different depending on the discipline and/or scope of project.

Having a call-out that goes more in-depth, but can be skipped by instructors might work. It might be as simple as discussing _automated_ vs _automatic_

@OMahoneyM I like this suggestion. I'd like to emphasize (for future reference) that since Dracula is gendered male, we need to be careful that we do not eliminate *all* female...