Differences
This shows you the differences between two versions of the page.
| Both sides previous revision Previous revision Next revision | Previous revision | ||
| kubernetes_github_workflow [2018/04/08 14:17] – [The workflow] rpjday | kubernetes_github_workflow [2018/04/08 14:21] (current) – [The workflow] rpjday | ||
|---|---|---|---|
| Line 41: | Line 41: | ||
| upstream no_push (push) | upstream no_push (push) | ||
| $ | $ | ||
| + | </ | ||
| + | |||
| + | Finally, regularly pull new content and merge it into the '' | ||
| + | |||
| + | < | ||
| + | $ git checkout master | ||
| + | $ git fetch upstream | ||
| + | $ git merge upstream/ | ||
| </ | </ | ||