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.

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

Merge pull request #2 from qmk/master #3035

Closed
wants to merge 1 commit into from
Closed

Merge pull request #2 from qmk/master #3035

wants to merge 1 commit into from

Conversation

o193746285
Copy link

update from original

update from original
@o193746285 o193746285 closed this May 24, 2018
@o193746285 o193746285 reopened this May 24, 2018
@drashna
Copy link
Member

drashna commented May 24, 2018

This doesn't change anything.

Were you trying to add something here?

@o193746285
Copy link
Author

o193746285 commented May 25, 2018 via email

@drashna
Copy link
Member

drashna commented May 25, 2018

You're trying to update your repo?

Then you need to do so locally, ideally. git merge is the simplest way to do that. Otherwise, git rebase is cleaner, IMO.

But to do this, you need to make sure you clone from your fork, and then set the upstream:
https://help.github.com/articles/configuring-a-remote-for-a-fork/

Then, you'd want to do this: https://help.github.com/articles/merging-an-upstream-repository-into-your-fork/

And ... because merge conflicts are pretty much inevitable: https://help.github.com/articles/addressing-merge-conflicts/

@drashna
Copy link
Member

drashna commented May 25, 2018

And I'm going to close this. If you need more help with this, open an issue and I (or somebody else) will assist you there.

@drashna drashna closed this May 25, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants