search

dsccommunity / dsccommunity.org

DSC community organisation's website
https://dsccommunity.org
MIT License
42 stars 21 forks source link

Improve "Resolve merge conflicts" #218

Open johlju opened 2 weeks ago

johlju commented 2 weeks ago

We have documented how to resolve merge conflicts.

https://github.com/dsccommunity/dsccommunity.org/blob/dddc809fb6486cf70ee2d1a4d0343d9f4b152a34/content/guidelines/contributing.md?plain=1#L833

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/