Chapter 3 polish #43
Chapter 3 polish #43
Conversation
|
Ready to merge, if'n you like it. |
Conflicts: book/03-git-branching/1-git-branching.asc
|
Mostly small changes, though I did move 'Undoing Merges' to Ch7 as I felt it was a little advanced at this point in the narrative. |
| For now, let's assume you’ve committed all your changes, so you can switch back to your master branch: | ||
| However, before you do that, note that if your working directory or staging area has uncommitted changes that conflict with the branch you're checking out, Git won't let you switch branches. | ||
| It's best to have a clean working state when you switch branches. | ||
| There are ways to get around this (namely, stashing and commit amending) that we'll cover <<_git_stashing, later>>. |
There was a problem hiding this comment.
It's a weak preference, but I'm wondering if this is the right way to go. It'll show up as
that we'll cover later.
…in HTML and a digital PDF, but all that linky information will be lost in print. I kind of like using that we'll cover later on, in <<_git_stashing>>., because it'll show up as:
that we'll cover later on, in Section 3.2, Stashing.
Like I said, it's a weak preference. If you have a strong opinion either way, I'm cool with it.
There was a problem hiding this comment.
Yeah, I like your way better, I'll change it.
|
Just the one question about naming cross-references; otherwise this looks really good. |
Various edits, and re-exported graphics at 300dpi. Discovered some that were missing, and notated them in #42.