UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit 923f86bc authored by joshwolf's avatar joshwolf
Browse files

Merge branch 'docs-update-squash-command' into 'staging'

docs: update contributing guide to rebase of origin/master not local master branch

Updating the squash command to reference origin/master instead of the local master branch in the event a local environment's master branch is not up to date.

See merge request platform-one/big-bang/umbrella!150
parents 3388a9b3 7c09176a
No related branches found
No related tags found
2 merge requests!188Staging,!150docs: update contributing guide to rebase of origin/master not local master branch
Pipeline #148735 waiting for manual action
......@@ -72,7 +72,7 @@ Here is a quick tip to squash all commits for a branch named `test`:
```
git checkout test
git reset $(git merge-base master $(git rev-parse --abbrev-ref HEAD))
git reset $(git merge-base origin/master $(git rev-parse --abbrev-ref HEAD))
git add -A
git commit -m "feat: example conventional commit"
git push --force
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment