doc: update the Troubleshooting section of the Collaborator Guide#26652
Uh oh!
There was an error while loading. Please reload this page.
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
In the Troubleshooting portion of the Collaborator Guide, there is a copy/pasted error message. The message is out of date. More recent git contains a more concise and clear message. Update the text to reflect the current git error message.
In the Troubleshooting section of the Collaborator Guide, there is one particularly lengthy and difficult-to-understand sentence. Make it shorter and more clear.
MemberAuthor
Trott commented Mar 14, 2019
(Change to the git |
| hint: to the same ref. You may want to first integrate the remote changes | ||
| hint: (e.g. 'git pull ...') before pushing again. | ||
| hint: Updates were rejected because the tip of your current branch is behind | ||
| hint: its remote counterpart. Integrate the remote changes (e.g. |
Member
There was a problem hiding this comment.
The new description is definitely on the point and correct but the former one seems easier to understand or at least to me, it seems the former version required less knowledge about git. I personally would stick to the former version for the first sentence.
MemberAuthor
There was a problem hiding this comment.
How about just removing all the hint text and leaving lines 603-605? That's the relevant part anyway. The hint text will be whatever and we don't control it.
Member
There was a problem hiding this comment.
Looking at it again: I just realized this is 1-to-1 the actual git hint. Therefore it's probably indeed good to use that.
BridgeAR approved these changes Mar 14, 2019
Trott added the author ready 
vsemozhetbyt added the meta 
vsemozhetbyt approved these changes Mar 14, 2019
MemberAuthor
Trott commented Mar 16, 2019
Landed in 5a23a87...22de2cf |
Trott added a commit to Trott/io.js that referenced this pull request Mar 16, 2019
In the Troubleshooting portion of the Collaborator Guide, there is a copy/pasted error message. The message is out of date. More recent git contains a more concise and clear message. Update the text to reflect the current git error message. PR-URL: nodejs#26652 Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Vse Mozhet Byt <[email protected]>
Trott added a commit to Trott/io.js that referenced this pull request Mar 16, 2019
In the Troubleshooting section of the Collaborator Guide, there is one particularly lengthy and difficult-to-understand sentence. Make it shorter and more clear. PR-URL: nodejs#26652 Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Vse Mozhet Byt <[email protected]>
targos pushed a commit to targos/node that referenced this pull request Mar 27, 2019
In the Troubleshooting portion of the Collaborator Guide, there is a copy/pasted error message. The message is out of date. More recent git contains a more concise and clear message. Update the text to reflect the current git error message. PR-URL: nodejs#26652 Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Vse Mozhet Byt <[email protected]>
targos pushed a commit to targos/node that referenced this pull request Mar 27, 2019
In the Troubleshooting section of the Collaborator Guide, there is one particularly lengthy and difficult-to-understand sentence. Make it shorter and more clear. PR-URL: nodejs#26652 Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Vse Mozhet Byt <[email protected]>
targos pushed a commit that referenced this pull request Mar 27, 2019
In the Troubleshooting portion of the Collaborator Guide, there is a copy/pasted error message. The message is out of date. More recent git contains a more concise and clear message. Update the text to reflect the current git error message. PR-URL: #26652 Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Vse Mozhet Byt <[email protected]>
targos pushed a commit that referenced this pull request Mar 27, 2019
In the Troubleshooting section of the Collaborator Guide, there is one particularly lengthy and difficult-to-understand sentence. Make it shorter and more clear. PR-URL: #26652 Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Vse Mozhet Byt <[email protected]>
BethGriggs pushed a commit that referenced this pull request Apr 17, 2019
In the Troubleshooting portion of the Collaborator Guide, there is a copy/pasted error message. The message is out of date. More recent git contains a more concise and clear message. Update the text to reflect the current git error message. PR-URL: #26652 Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Vse Mozhet Byt <[email protected]>
BethGriggs pushed a commit that referenced this pull request Apr 17, 2019
In the Troubleshooting section of the Collaborator Guide, there is one particularly lengthy and difficult-to-understand sentence. Make it shorter and more clear. PR-URL: #26652 Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Vse Mozhet Byt <[email protected]>
Merged
This was referenced May 29, 2019
This was referenced Mar 11, 2021
This was referenced May 25, 2021
This was referenced Apr 7, 2022
This was referenced Jan 31, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment
4 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.
Some changes to keep things simple and direct.
Checklist
make -j4 test(UNIX), orvcbuild test(Windows) passes