Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Document PR commits preference in CONTRIBUTING.md #4704

Merged
merged 6 commits into from
Nov 13, 2023
Merged

Document PR commits preference in CONTRIBUTING.md #4704

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
31f2b63
docs: Document PR commits preference in CONTRIBUTING.md (#4701)
mikeblum Nov 9, 2023
dc7cd82
updated CHANGELOG.md
mikeblum Nov 9, 2023
35a4dc7
nit: rewording commits
mikeblum Nov 9, 2023
4881ebb
Update CHANGELOG.md
pellared Nov 10, 2023
657ec64
Update CONTRIBUTING.md
mikeblum Nov 12, 2023
251601c
Merge branch 'main' into GH-4701-contributing-pr-commit-pref
mikeblum Nov 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Expand Up @@ -10,6 +10,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm

### Added

- Document PR commits preference in CONTRIBUTING.md (#4701)
- Add `go.opentelemetry.io/otel/bridge/opencensus.InstallTraceBridge`, which installs the OpenCensus trace bridge, and replaces `opencensus.NewTracer`. (#4567)
- Add scope version to trace and metric bridges in `go.opentelemetry.io/otel/bridge/opencensus`. (#4584)
- Add the `go.opentelemetry.io/otel/trace/embedded` package to be embedded in the exported trace API interfaces. (#4620)
Expand Down
2 changes: 2 additions & 0 deletions CONTRIBUTING.md
View file
Open in desktop
Expand Up @@ -90,6 +90,8 @@ git push <YOUR_FORK> <YOUR_BRANCH_NAME>
Open a pull request against the main `opentelemetry-go` repo. Be sure to add the pull
request ID to the entry you added to `CHANGELOG.md`.

To help facilitate reviewing and merging your PR, please refrain from force-pushing (`git push --force/-f`) or manually rebasing (`git rebase -i HEAD~1`). Re-writing history makes it difficult to keep track of iterations during code review (An exception would be when `reword`ing commits). All PRs are automatically squashed down to a single commit upon merge to `main`.
mikeblum marked this conversation as resolved.
Show resolved Hide resolved

### How to Receive Comments

* If the PR is not ready for review, please put `[WIP]` in the title,
Expand Down