We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
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
We have documented how to resolve merge conflicts.
dsccommunity.org/content/guidelines/contributing.md
Line 833 in dddc809
GitHub has posted a excelllent guide here that we should also reference for resolving merge conflicts using git pull and git merge: https://github.blog/developer-skills/github-education/beginners-guide-to-github-merging-a-pull-request/
git pull
git merge
The text was updated successfully, but these errors were encountered:
No branches or pull requests
We have documented how to resolve merge conflicts.
dsccommunity.org/content/guidelines/contributing.md
Line 833 in dddc809
GitHub has posted a excelllent guide here that we should also reference for resolving merge conflicts using
git pullandgit merge:https://github.blog/developer-skills/github-education/beginners-guide-to-github-merging-a-pull-request/
The text was updated successfully, but these errors were encountered: