@sstok on updating forks

gistfile1.txt

```
git fetch upstream
git checkout remote_branch
git reset --hard upstream/remote_branch
git checkout working_branch
git reset --hard upstream/remote_branch
git cherry-pick commit // The one that you need to keep.

git push -f origin local_branch:local_branch
```

This should do the trick 👍  always prefer to rebase when puling instead of merging as creates ugly merge bubbles.

Rebase can be done this way:

git fetch upstream
git rebase upstream/master

Or this way:

git remote add upstream [git-url]
git checkout master
git pull --rebase master