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

Use backticks to format file reference in resolving-a-merge-conflict-using-the-command-line#competing-line-change-merge-conflicts #35456

Closed
1 task done
nguyenalex836 opened this issue Nov 27, 2024 · 1 comment · Fixed by #35469
Labels
content This issue or pull request belongs to the Docs Content team good first issue Good for newcomers pull requests Content related to pull requests

Comments

@nguyenalex836
Copy link
Contributor

Code of Conduct

What article on docs.github.com is affected?

https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line#competing-line-change-merge-conflicts

This issue is intended for newcomers to the OS Docs repo! 💛

If you are veteran of the OS Docs repo and are looking for issues to work on, take a look at our help wanted section

What part(s) of the article would you like to see updated?

Generate a list of the files affected by the merge conflict. In this example, the file styleguide.md has a merge conflict.

Use backticks to format references to the file names, per our style guide

Additional information

No response

@nguyenalex836 nguyenalex836 added good first issue Good for newcomers content This issue or pull request belongs to the Docs Content team pull requests Content related to pull requests labels Nov 27, 2024
@github-actions github-actions bot added the triage Do not begin working on this issue until triaged by the team label Nov 27, 2024
@nguyenalex836 nguyenalex836 removed the triage Do not begin working on this issue until triaged by the team label Nov 27, 2024
@annegentle
Copy link
Contributor

I'd like to work on this issue 👋

@nguyenalex836 nguyenalex836 linked a pull request Dec 2, 2024 that will close this issue
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
content This issue or pull request belongs to the Docs Content team good first issue Good for newcomers pull requests Content related to pull requests
Projects
None yet
Development

Successfully merging a pull request may close this issue.

2 participants