doc: removed old git conflict markers form fs.md#7590
Closed
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
"doc/api/fs.md" file had some conflict markers like "<<<<<<< HEAD" that are visible at the bottom of https://nodejs.org/api/fs.html
nodejs-github-bot added doc 
Member
addaleax commented Jul 7, 2016
LGTM |
Member
jasnell commented Jul 7, 2016
doh! not sure how I missed those! thank you! LGTM |
Contributor
Maybe we can automatically check for these kinds of lines in files at least before release, like a simple grep in This PR LGTM though. |
Contributor
cjihrig commented Jul 7, 2016
We should leave these in. They add character to the file. :-P LGTM |
addaleax referenced this pull request Jul 8, 2016
The require('constants') module is currently undocumented and mashes together unrelated constants. This refactors the require('constants') in favor of distinct os.constants, fs.constants, and crypto.constants that are specific to the modules for which they are relevant. The next step is to document those within the specific modules. PR-URL: #6534 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Robert Lindstaedt <[email protected]> Conflicts: doc/api/fs.md
Member
ChALkeR commented Jul 8, 2016
LGTM |
Member
ChALkeR commented Jul 8, 2016
@mscdex At least some lint rules for docs would be a better solution, I presume. |
Contributor
mscdex commented Jul 8, 2016
@ChALkeR The problem is that conflict markers could happen anywhere, not just the docs. |
Member
@mscdex Yes, then a good solution would involve both a check for the markers and linting docs, as possible mistakes in the docs are not limited to conflict markers. I found some more issues using lint, will file a PR today. |
Contributor
MylesBorins commented Jul 9, 2016
LGTM |
1 task
evanlucas pushed a commit that referenced this pull request Jul 18, 2016
"doc/api/fs.md" file had some conflict markers like "<<<<<<< HEAD" that are visible at the bottom of https://nodejs.org/api/fs.html PR-URL: #7590 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Brian White <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Сковорода Никита Андреевич <[email protected]> Reviewed-By: Myles Borins <[email protected]>
Contributor
evanlucas commented Jul 18, 2016
Landed in f0d9610. Thanks! |
evanlucas pushed a commit that referenced this pull request Jul 20, 2016
"doc/api/fs.md" file had some conflict markers like "<<<<<<< HEAD" that are visible at the bottom of https://nodejs.org/api/fs.html PR-URL: #7590 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Brian White <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Сковорода Никита Андреевич <[email protected]> Reviewed-By: Myles Borins <[email protected]>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment
9 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.
Checklist
Affected core subsystem(s)
Description of change
"doc/api/fs.md" file had some conflict markers like "<<<<<<< HEAD" that are visible at the bottom of https://nodejs.org/api/fs.html