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.

Sign up for GitHub

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

Jump to bottom

Resolve a Merge Conflict for a Pull Request #12

Open

timmwille opened this issue Dec 8, 2020 · 2 comments

Labels

GUIDE

Collaborator

timmwille commented Dec 8, 2020

timmwille added the GUIDE label

Collaborator

PyGamma commented Jan 10, 2021

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

PyGamma closed this as completed

bmen reopened this

Collaborator

bmen commented Jan 10, 2021

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment