From fb87dc44261d35280c308f8b02f9b3bbcaf1ccd9 Mon Sep 17 00:00:00 2001 From: Ferran Rodenas Date: Thu, 9 Sep 2021 08:38:07 -0700 Subject: [PATCH] Update CONTRIBUTING.md to refelect main branch Signed-off-by: Ferran Rodenas --- CONTRIBUTING.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1148d42f..66e5b00d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -16,19 +16,19 @@ Example: ``` shell git remote add upstream https://github.com/vmware/terraform-provider-vra.git -git checkout -b my-new-feature master -git commit -a +git checkout -b my-new-feature main +git commit -s -a git push origin my-new-feature ``` ### Staying In Sync With Upstream -When your branch gets out of sync with the vmware/master branch, use the following to update: +When your branch gets out of sync with the vmware/main branch, use the following to update: ``` shell git checkout my-new-feature git fetch -a -git pull --rebase upstream master +git pull --rebase upstream main git push --force-with-lease origin my-new-feature ``` @@ -51,7 +51,7 @@ If you need to squash changes into an earlier commit, you can use: ``` shell git add . git commit --fixup -git rebase -i --autosquash master +git rebase -i --autosquash main git push --force-with-lease origin my-new-feature ```