From 157c2a8b3ec4f77a862e3d0de4be46ef691b349c Mon Sep 17 00:00:00 2001 From: VMware GitHub Bot Date: Thu, 6 Sep 2018 14:28:56 -0500 Subject: [PATCH] Add CONTRIBUTING template --- CONTRIBUTING.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f1bf47d..abec9ed 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -5,6 +5,8 @@ read our [Developer Certificate of Origin](https://cla.vmware.com/dco). All cont signed as described on that page. Your signature certifies that you wrote the patch or have the right to pass it on as an open-source patch. +## Community + ## Contribution Flow This is a rough outline of what a contributor's workflow looks like: @@ -31,7 +33,7 @@ When your branch gets out of sync with the vmware/main branch, use the following ``` shell git checkout my-new-feature git fetch -a -git pull --rebase upstream main +git pull --rebase upstream master git push --force-with-lease origin my-new-feature ```