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.
Edited by runyontr
Merge request reports
Activity
added 72 commits
-
c62e703f...9b9e9577 - 53 commits from branch
master
- b94b0f57 - chore: add common labels
- 32d12454 - fix: added remaining labels to gitlab repo
- 001812f6 - fix: bump version
- b6e72096 - ci: widen regex for skipping ci on docs branches
- 67fb0169 - chore: update proposed version
- 76f2d072 - chore: forgot changlog update
- 252cb321 - kiwi-sidecar
- 29d63756 - feat: Simplification of Grafana OIDC Configuration
- 232d3876 - feat: Grafana OIDC template and documentation
- 3c45a589 - feat: Grafana OIDC template and documentation
- 97d21784 - feat: Grafana OIDC template and documentation
- 91fb73c5 - feat: Grafana OIDC template and documentation
- 4c6a755d - Merge remote-tracking branch 'origin/add-kube-labels' into staging
- d2284171 - Merge remote-tracking branch 'origin/bb-843-grafana' into staging
- 74300c69 - Merge remote-tracking branch 'origin/ci/skip-docs' into staging
- 4f234091 - chore: updated changlog
- f9957122 - ci: only run infra jobs on merges to master
- 3388a9b3 - Merge branch 'ci/staging' into 'staging'
- 7c09176a - docs: update contributing guide to rebase of origin/master not local master branch
Toggle commit list-
c62e703f...9b9e9577 - 53 commits from branch
mentioned in commit 923f86bc
Please register or sign in to reply