On branch mergify/bp/8.14/pr-4908
Your branch is up to date with 'origin/8.14'.

You are currently cherry-picking commit 6b7879127d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   internal/pkg/agent/cmd/cmd_test.go
	modified:   internal/pkg/agent/cmd/otel.go
	modified:   internal/pkg/agent/cmd/otel_flags.go
	modified:   internal/pkg/agent/cmd/otel_flags_test.go
	new file:   internal/pkg/agent/cmd/otel_windows.go
	new file:   internal/pkg/agent/cmd/otel_windows_test.go
	modified:   internal/pkg/agent/cmd/validate.go
	modified:   internal/pkg/agent/cmd/validate_test.go
	modified:   internal/pkg/otel/config_file_provider.go
	modified:   internal/pkg/otel/config_file_provider_test.go
	modified:   internal/pkg/otel/run.go
	modified:   internal/pkg/otel/validate.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   NOTICE.txt
	both modified:   go.mod
	both modified:   go.sum
	both modified:   internal/pkg/agent/cmd/common.go
	both modified:   internal/pkg/otel/README.md
	both modified:   internal/pkg/otel/components.go
	deleted by us:   internal/pkg/otel/run_test.go
	deleted by us:   internal/pkg/otel/testdata/all-components.yml

git fetch upstream
git checkout -b mergify/bp/8.14/pr-4908 upstream/mergify/bp/8.14/pr-4908
git merge upstream/8.14
git push upstream mergify/bp/8.14/pr-4908