Port the "three trees" article to chapter 7 #36
Conversation
en/book/02-git-basics/chapter2.asc
Outdated
There was a problem hiding this comment.
I'm a bit torn. This section essentially duplicates information from the "reset" section, but the content up there is just a mention. Got an opinion?
|
I actually don't think this belongs this early. I'm thinking maybe do a simplified version of it here and revisit the concept back in the Tools chapter. |
|
So this turned out to be a polish-edit of Chapter 2 and a bunch of content added to Chapter 7. Some of the ch2 edits might conflict with #44; feel free to toss them if you don't like them. |
Conflicts: book/02-git-basics/1-git-basics.asc book/07-git-tools/1-git-tools.asc
|
I resolved the conflicts with #44, and slotted the three-trees content into its proper place in Chapter 7. This should be ready to go. |
ben
changed the title
Conflicts: book/03-git-branching/1-git-branching.asc
|
Fixed the conflicts again. I'm going to go ahead and merge this so you can split up that chapter if you want to. |
Port the "three trees" article to chapter 7
What it says on the tin.