submodules.asc: clarify DbConnector/try-merge example#1420
Merged
ben merged 1 commit intoprogit:masterprogit/progit2:masterfrom Apr 21, 2020
salewski:ads/clarify-try-merge-in-ch7-submodulessalewski/book-progit2:ads/clarify-try-merge-in-ch7-submodulesCopy head branch name to clipboard
Merged
submodules.asc: clarify DbConnector/try-merge example#1420ben merged 1 commit intoprogit:masterprogit/progit2:masterfrom salewski:ads/clarify-try-merge-in-ch7-submodulessalewski/book-progit2:ads/clarify-try-merge-in-ch7-submodulesCopy head branch name to clipboard
ben merged 1 commit intoprogit:masterprogit/progit2:masterfrom
salewski:ads/clarify-try-merge-in-ch7-submodulessalewski/book-progit2:ads/clarify-try-merge-in-ch7-submodulesCopy head branch name to clipboard
Conversation
Fix AsciiDoc 'source,console' block to render separately the consecutive commands 'git branch try-merge c771610' and 'git merge try-merge'. This is accomplished by separating the commands with an empty line, and by omitting the unneeded "(DbConnector) " prefix in front of the 'git merge...' command prompt. Puts the example into the form consistent with the other command blocks, and also enhances readability. State explicitly in the prose that "try-merge" will be the name of the branch.
31f877d to
6629642
Compare
Member
|
Oh yeah, that's probably some leftover copy-paste junk. Thanks for improving this! |
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
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.
Fix AsciiDoc
source,consoleblock to render separately the consecutive commandsgit branch try-merge c771610andgit merge try-merge. This is accomplished by separating the commands with an empty line, and by omitting the unneeded "(DbConnector) " prefix in front of thegit merge...command prompt. Puts the example into the form consistent with the other command blocks, and also enhances readability.State explicitly in the prose that "try-merge" will be the name of the branch.