whoisryosuke

1. Clone forked repo
2. Checkout the master branch (or whichever branch you wanted to update)
3. Add the original repo as an upstream: git remote add upstream git-url-here.git
4. git fetch upstream
5. git merge upstream/master

whoisryosuke

function countDays($year, $month, $ignore) {
    $count = 0;
    $counter = mktime(0, 0, 0, $month, 1, $year);
    while (date("n", $counter) == $month) {
        if (in_array(date("w", $counter), $ignore) == false) {
            $count++;
        }
        $counter = strtotime("+1 day", $counter);
    }

whoisryosuke

function countDays($year, $month, $ignore) {
    $count = 0;
    $counter = mktime(0, 0, 0, $month, 1, $year);
    while (date("n", $counter) == $month) {
        if (in_array(date("w", $counter), $ignore) == false) {
            $count++;
        }
        $counter = strtotime("+1 day", $counter);
    }

whoisryosuke

const path = require('path')

module.exports = ({ config, mode }) => {

  // Adds absolute paths to imports
  config.resolve.alias = {
    ...config.resolve.alias,
    '@components': path.resolve(__dirname, '../src/components'),
    '@assets': path.resolve(__dirname, '../src/assets'),
    '@helpers': path.resolve(__dirname, '../src/helpers'),

whoisryosuke

import React, { useState, useEffect } from 'react'
import Header from './Header'
import debounce from '../../helpers/debounce'

const MobileHeader = () => {

  const [isMobile, setMobile] = useState(false)
  const [isVisible, setVisibility] = useState(false)

  const resize = () => {

whoisryosuke

// File: .storybook/config.js

import { configure, addDecorator } from '@kadira/storybook';
import Theme from './../src/ui/theme';
import React from 'react';
import { ThemeProvider } from 'styled-components'

function loadStories() {
  require('../stories');
}

whoisryosuke

  
{
  "compilerOptions": {
    "outDir": "./dist/",
    "sourceMap": true,
    "esModuleInterop": true,
    "allowSyntheticDefaultImports": true,
    "strict": true,
    "allowJs": true,
    "forceConsistentCasingInFileNames": true,

whoisryosuke

const path = require('path');
const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');

exports.onCreateWebpackConfig = ({ config, actions }) => {
  actions.setWebpackConfig({
    plugins: [
      new ForkTsCheckerWebpackPlugin({
        checkSyntacticErrors: true,
        formatter: 'codeframe',
        tslint: './tslint.json',

whoisryosuke

import Color from "tinycolor2";

/**
 * Creates column percentages based on column count
 */
const createColumns = columnCount => {
  const columns = {};
  for (let i = 1; i <= columnCount; i += 1) {
    columns[i] = `${(i / columnCount) * 100}%`;
  }

whoisryosuke

Updating a feature branch

First we'll update your local master branch. Go to your local project and check out the branch you want to merge into (your local master branch)

$ git checkout master

Fetch the remote, bringing the branches and their commits from the remote repository. You can use the -p, --prune option to delete any remote-tracking references that no longer exist in the remote. Commits to master will be stored in a local branch, remotes/origin/master