Merge changes from master branch

HubSpot / calling-extensions-sdk

A JavaScript SDK for integrating calling apps into HubSpot.

https://developers.hubspot.com/docs/api/crm/extensions/calling-sdk

MIT License

46 stars 29 forks source link

Merge changes from master branch #102

Closed esme closed 1 year ago

esme commented 1 year ago

Description

Merge changes from master branch.

Merge Checklist

Q	A
Adds Documentation?
Any Dependency Changes?
Patch: Bug Fix?
Minor: New Feature?
Major: Breaking Change?

BRAVE Checklist

[x] I have read the BRAVE checklist and confirmed if the following is necessary.

Q	A
Backwards Compatible?
Rollout/Rollback Plan?
Automated test coverage?
Verified that changes work?
Expect Dependencies to Fail?

github-actions[bot] commented 1 year ago

PR Preview Action v1.3.0 :---: :rocket: Deployed preview to https://HubSpot.github.io/calling-extensions-sdk/pr-preview/pr-102/ on branch gh-pages at 2023-04-12 18:53 UTC

esme commented 1 year ago

Is there any way to preserve git history as we merge from master into this branch? Asking because the commit section doesn't show it right now.

@alonso-cadenas The master branch has the git history and using merge here will preserve the history over rebase. I've been using rebase so far but I'm iffy about it this time as it is tricky to rebase these many changes. Eventually, we would merge project-demo-v1 into master and can squash the commits for a cleaner history.