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.

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

Added my project #38

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added my project #38

wants to merge 1 commit into from

Conversation

valentinsilvera
Copy link

Added

@zmknox
Copy link
Member

zmknox commented May 18, 2020

@valentinsilvera I cannot merge your branch until conflicts are resolved. Can you either

  1. Resolve the conflicts or
  2. Enable me to push to your fork to resolve them?

@valentinsilvera
Copy link
Author

Sure. How can I do either of those things? Sorry. I have only used GitHub for myself so far so not sure how these things work

valentinsilvera
valentinsilvera commented May 18, 2020
View reviewed changes
Copy link
Author

@valentinsilvera valentinsilvera left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tried to fix the merge issue

@zmknox
Copy link
Member

zmknox commented May 18, 2020

https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork

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

@zmknox zmknox zmknox approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@valentinsilvera @zmknox