Merge branch 'master' of gitlab.com:gaiety/gaiety-life

content/posts/crabs.md

@@ -0,0 +1,18 @@
+---
+title: Twitch Profile for Yuushagani
+date: 2020-02-17
+tags:
+  - Art
+  - Design
+coverImage: /images/uploads/crabs.png
+description: Diving headfirst into pixel art for Twitch Streaming
+---
+Buddy of mine [Yuushagani](https://www.twitch.tv/yuushagani) started really getting into Twitch streaming recently and needed some art done. I was happy to jump in where I could!
+
+It began with a sketch his wife (who goes by the handle of butanosuka) painted for the "King Crab" which Yuushagani roughly translates too. I digitized the crab design and packaged up an archive of a banner, avatar and several emotes.
+
+![Emotes](/images/uploads/crab-emotes.png)
+
+Later, Yuushagani added [Stream Avatars](https://streamavatars.com/) which introduced little animated characters that walk around the screen with various attachments like hats and holdables. I've since made roughly half of the crab pixel art for the channel that the followers can enjoy as they scuttle across the screen!
+
+These commissions were a blast and I'd consider taking more in the future.

content/posts/generic-barbarian-mini.md

@@ -3,6 +3,7 @@ title: Barbarian of Cold
 date: 2019-06-10T18:35:00.873Z
 tags:
   - Mini
+  - Art
 coverImage: /images/uploads/barbarian-mini.jpg
 description: Quite proud of how this turned out! Starting to really gain some confidence.
 ---

content/posts/working-with-forked-repos.md

@@ -0,0 +1,35 @@
+---
+title: Working With Forked Repos
+description: Fetching upstream and things
+date: 2020-02-02
+tags:
+  - Tech
+---
+
+Though I've been building web apps for many years, my direct experience with contributing to open source projects is surprisingly limited. Thus when I found myself forking and maintaining a fork as I submitted several PR's for a single project over time I was a little lost with what to do.
+
+So here are some things I've learned thus far.
+
+## Why Fork, and How do I Fork?
+
+Github, Gitlab and other source-code repositories allow for you to "fork" code. I previously thought this was to split work into a different direction, but in fact its also to give a developer control over proposed changes they'd like to push back to source. Thus, submitting a PR to an open source repository looks like this:
+
+1. Click `Fork` on the source-code repository
+2. Clone your newly forked repository
+3. Make your changes on a new branch
+4. Push your branch to your forked repository (A misconception I had was you may not push a branch to many open source repositories directly, this is intentional)
+5. Create a PR that merges your branch from your fork to the original non-forked repository
+
+## Updating the Forked Master Branch
+
+Over time your forked repository will get out of date. A common scenario is desiring to get the latest master from the source repository.
+
+```bash
+git remote add upstream ORIGINAL_PROJECT_CLONE_URL
+git fetch upstream
+git checkout master
+git rebase upstream/master
+```
+
+Now you may do all the standard things you wish, such as merging master into your current branch `git merge master` to stay up to date with your proposed changes.
+