anthonytranDev

git checkout master
git pull
git checkout <branch-name>
git rebase master
** resolve conflicts in selected files**
git rebase --continue
npm i
git push --force 

anthonytranDev

MIT License (MIT)
Copyright (c) 2019. <Authors>
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

anthonytranDev

export NVM_DIR="$HOME/.nvm" # This assigns NVM_DIR the Home directory - i.e. ~/
[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"  # This loads nvm

anthonytranDev

const path = require("path");

module.exports = (baseConfig, env, defaultConfig) => {
  /**
   * Enable Images to be utilised
  */
  // Transpile Gatsby module because Gatsby includes un-transpiled ES6 code.
  defaultConfig.module.rules[0].exclude = [/node_modules\/(?!(gatsby)\/)/]

  // use installed babel-loader which is v8.0-beta (which is meant to work with @babel/core@7)

anthonytranDev

Within Mac OSX

cd ~/.config/yarn/global

Or ask Yarn itself

yarn global dir

anthonytranDev

mv * .[^.]* ..