Chapter 7 Update #60
Merged
Chapter 7 Update #60
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Conflicts: book/07-git-tools/1-git-tools.asc
Conflicts: book/07-git-tools/1-git-tools.asc
|
Fixed the merge conflict I made. The section order seems good to me. I like how this is looking! |
Conflicts: book/07-git-tools/1-git-tools.asc
Conflicts: book/03-git-branching/1-git-branching.asc book/07-git-tools/1-git-tools.asc book/11-git-internals/1-git-internals.asc
I'm thinking that this was not a great idea to have included in the first place. I don't really think it's helpful to have people using subtree merges as a submodule replacement and I think it would be confusing for the people that try. We can put this online somewhere as a reference, but I no longer think it should be in the book.
I updated the notes section as far as I could, but ultimately I couldn't get the 'notes merge' command to work at all, even under the simplest circumstances. Users are probably better off not even knowing that the functionality exists, honestly.
I thought this might be interesting, but I'm going to edit for content here. I don't think this will be used by very many people at all and it will only serve to confuse a lot of people.
I think this is more of a tool than an 'other scm' thing. It's a great section though and though I had some stuff fleshed out I had very little written, so we should just go with yours, Ben.
I ended up removing nearly all of the original submodule content and starting over, since so much has changed since the original section was written.
|
OK, the first pass of this is done. I'm going to merge this in. I would like to add an 'Advanced Merging' section and possibly a 'Git Subtree' section, but I'll start a new PR if I do. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I've split up the chapter into multiple files for easier work as discussed in #50.
Still to do: