Meetup 002 – 23.05.2018

Hosted by: moz://a Community Space Berlin

WordPress Tech Workshop Git/GitHub

Setup

Getting started

Collaborate

Preparation: Fork a repo on GitHub

Clone your fork of the repo:

git clone git@github.com:your_github_handle/tech-website.git

Add remote as upstream:

git remote add upstream git@github.com:wp-berlin/tech-website.git

List available remotes:

git remote -v

The output should look something like this:

origin    git@github.com:your_github_handle/tech-website.git (fetch)
origin    git@github.com:your_github_handle/tech-website.git (push)
upstream  git@github.com:wp-berlin/tech-website.git (fetch)
upstream  git@github.com:wp-berlin/tech-website.git (push)

Fetch potential changes from upstream:

git fetch upstream

Compare upstream to master:

git diff upstream/master

Merge upstream into master:

git merge upstream/master

Delete remote:

git remote rm upstream

Push the changes to your fork on GitHub:

git push origin master

Next: Create a pull request on GitHub

Further reading