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

git-merge-file: add page #14928

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

git-merge-file: add page #14928

wants to merge 1 commit into from

Conversation

MQ-06
Copy link

@MQ-06 MQ-06 commented Nov 21, 2024

  • The page(s) are in the correct platform directories: common, linux, osx, windows, sunos, android, etc.
  • The page(s) have at most 8 examples.
  • The page description(s) have links to documentation or a homepage.
  • The page(s) follow the content guidelines.
  • The page(s) follow the style guide.
  • The PR title conforms to the recommended templates.
  • Version of the command being documented (if known):

@CLAassistant
Copy link

CLAassistant commented Nov 21, 2024

CLA assistant check
All committers have signed the CLA.

@github-actions github-actions bot added the new command Issues requesting creation of a new page. label Nov 21, 2024
@tldr-bot
Copy link

The build for this PR failed with the following error(s):

pages/common/git-merge-file.md:10 MD001/heading-increment Heading levels should only increment by one level at a time [Expected: h2; Actual: h3]
pages/common/git-merge-file.md:13 MD031/blanks-around-fences Fenced code blocks should be surrounded by blank lines [Context: "```bash"]
pages/common/git-merge-file.md:18 MD031/blanks-around-fences Fenced code blocks should be surrounded by blank lines [Context: "```bash"]
pages/common/git-merge-file.md:23 MD031/blanks-around-fences Fenced code blocks should be surrounded by blank lines [Context: "```bash"]
pages/common/git-merge-file.md:28 MD031/blanks-around-fences Fenced code blocks should be surrounded by blank lines [Context: "```bash"]
pages/common/git-merge-file.md:33 MD031/blanks-around-fences Fenced code blocks should be surrounded by blank lines [Context: "```bash"]
pages/common/git-merge-file.md:38 MD031/blanks-around-fences Fenced code blocks should be surrounded by blank lines [Context: "```bash"]
pages/common/git-merge-file.md:43 MD031/blanks-around-fences Fenced code blocks should be surrounded by blank lines [Context: "```bash"]
pages/common/git-merge-file.md:48 MD031/blanks-around-fences Fenced code blocks should be surrounded by blank lines [Context: "```bash"]
pages/common/git-merge-file.md:55 MD031/blanks-around-fences Fenced code blocks should be surrounded by blank lines [Context: "```bash"]
pages/common/git-merge-file.md:60 MD031/blanks-around-fences Fenced code blocks should be surrounded by blank lines [Context: "```bash"]
pages/common/git-merge-file.md:65 MD031/blanks-around-fences Fenced code blocks should be surrounded by blank lines [Context: "```bash"]
pages/common/git-merge-file.md:
Error: Parse error on line 4:
# git-merge-file```bashgit merge-fi
----------------^
Expecting 'TEXT', 'GREATER_THAN', got 'BACKTICK'
pages/common/git-merge-file.md:1: TLDR001 File should contain no leading whitespace

Please fix the error(s) and push again.

@spageektti
Copy link
Member

Hi. Thanks for your contribution. Have you seen CONTRIBUTING.md and the style guide?

Copy link
Member

@spageektti spageektti left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You copied/written a man page, which is not what tldr-pages are about.

@spageektti spageektti changed the title Added git-merge-file.md git-merge-file: add page Nov 21, 2024
@MQ-06
Copy link
Author

MQ-06 commented Nov 21, 2024

@spageektti let me review the mistakes and get back to you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
new command Issues requesting creation of a new page.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants