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

update to upstream #1

Merged
merged 6 commits into from Feb 23, 2014
Merged

update to upstream #1

merged 6 commits into from Feb 23, 2014

Conversation

@hupili
Copy link
Owner

hupili commented Feb 23, 2014

For non-developers (who does not use Git), please create Pull Request from code4hk:gh-pages to your own repo, i.e.:

  • Use your own repo as the base branch
  • Use code4hk:gh-pages as the HEAD
@hupili
Copy link
Owner Author

hupili commented Feb 23, 2014

Let's merge the upstream changes back. After this you are good to go for more posts.

@hupili
Copy link
Owner Author

hupili commented Feb 23, 2014

More notes.

If you can not follow what we are discussing in this thread. Just ignore it. We love great content and don't want to complicate the workflow. Usually there will not be any merge conflicts if everyone only edit his/her own posts. In this way, after forking for the first time, you can repeated create new things and issue Pull Requests. However, it is recommended that you update repo before editing.

Whenever in doubt, please comment below. You can also come to one of our hackathon and ask someone to show you the workflow directly. Without those tech jargons, the whole process is just a matter of some mouse clicks.

hupili added a commit that referenced this pull request Feb 23, 2014
@hupili hupili merged commit a1cff2f into hupili:gh-pages Feb 23, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

1 participant
You can’t perform that action at this time.