Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

doc: removed old git conflict markers form fs.md #7590

Closed
wants to merge 1 commit into from

Conversation

jaimehrubiks
Copy link

@jaimehrubiks jaimehrubiks commented Jul 7, 2016

Checklist
  • documentation is changed or added
  • commit message follows commit guidelines
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

"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 nodejs-github-bot added doc Issues and PRs related to the documentations. fs Issues and PRs related to the fs subsystem / file system. labels Jul 7, 2016
@addaleax
Copy link
Member

addaleax commented Jul 7, 2016

LGTM

@addaleax addaleax added the v6.x label Jul 7, 2016
@jasnell
Copy link
Member

jasnell commented Jul 7, 2016

doh! not sure how I missed those! thank you! LGTM

@mscdex
Copy link
Contributor

mscdex commented Jul 7, 2016

Maybe we can automatically check for these kinds of lines in files at least before release, like a simple grep in Makefile or similar?

This PR LGTM though.

@cjihrig
Copy link
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
@ChALkeR
Copy link
Member

ChALkeR commented Jul 8, 2016

LGTM

@ChALkeR
Copy link
Member

ChALkeR commented Jul 8, 2016

@mscdex At least some lint rules for docs would be a better solution, I presume.

@mscdex
Copy link
Contributor

mscdex commented Jul 8, 2016

@ChALkeR The problem is that conflict markers could happen anywhere, not just the docs.

@ChALkeR
Copy link
Member

ChALkeR commented Jul 9, 2016

@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.

@MylesBorins
Copy link
Contributor

LGTM

@targos targos mentioned this pull request Jul 9, 2016
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]>
@evanlucas
Copy link
Contributor

Landed in f0d9610. Thanks!

@evanlucas evanlucas closed this Jul 18, 2016
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 free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
doc Issues and PRs related to the documentations. fs Issues and PRs related to the fs subsystem / file system.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants