Skip to content

Instantly share code, notes, and snippets.

View jimangel's full-sized avatar
🌤️
around

Jim Angel jimangel

🌤️
around
View GitHub Profile
@jimangel
jimangel / readme.md
Last active June 18, 2019 18:22
Merge Conflict Deep Dive

Here is the process to merge master into dev-1.15. Please read the entire document before starting any work.

Start with a fresh slate

$ git clone https://github.com/jimangel/website.git website-docs
$ cd website-docs
$ git remote add upstream https://github.com/kubernetes/website.git
$ # validate
$ git remote -v
$ git fetch upstream