GIT cheatsheet

GIT.md

Checkout master version of a file

git checkout origin/master -- api/routes.ts

Merge changes from BranchA into BranchB

git checkout BranchB
git merge BranchA

How to delete a git submodule

[submodule "externals/shopify_revfluence"]
    path = externals/shopify_revfluence
	  url = git@github.com:Revfluence/shopify_python_api.git
   
> git rm externals/shopify_revfluence

How to add a git submodule

git submodule add --force https://github.com/Shopify/shopify_python_api.git externals/shopify_revfluence