search

ASKnet-Open-Training / Github-Guidance

Here you find all information about how to use Github and get support
https://asknet-open-training.github.io/Github-Guidance
Other
6 stars 6 forks source link

Resolve a Merge Conflict for a Pull Request #12

Open timmwille opened 3 years ago

timmwille commented 3 years ago

Resolve-Merge-Conflict

PyGamma commented 3 years ago

Thanks for this awesome work, More details can be found here https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-on-github and on youtube video at https://www.youtube.com/watch?v=JtIX3HJKwfo

bmen commented 3 years ago

The page in the guide is already created, but the content still needs to be added. https://asknet-open-training.github.io/Github-Guidance/pages/github-repo/pull-request-merge-conflict/

The content can be easily added by clicking "Edit this page on GitHub" at the very bottom of the page. This will take you directly to the source. readme-edit-this-page