-
Notifications
You must be signed in to change notification settings - Fork 601
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.
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
chore: add fast-website to the yarn and lerna workspaces #3081
chore: add fast-website to the yarn and lerna workspaces #3081
Conversation
I wasn't sure if commits from master should be rebased or done with a merge commit. I can force-push to redo it if a merge is desired over a rebase. |
I think we're going to squash merge these in the end, so it may not matter as much. Anyone have opinions on this? /cc @nicholasrice @chrisdholt |
I've been maintaining my own feature branches and just rebasing master and force pushing them every once in a while to keep the history clean, then when the feature branch gets merged i temporarily enable a rebase with master to preserve commit history. This gets a little murkier when multiple contributors are on a branch so I'm not necessarily advocating for that here. However we shouldn't have these commits in the PR, it makes reviewing difficult. I do think that preserving commit history would be nice. |
I agree with Jane's comments here. I think we'll run into trouble if with additional commits here. If we don't care too much about preserving history on the way back to master, we can leave it as is and squash, but I think it's valuable to have folks' commit history maintained. |
Thanks @janechu @EisenbergEffect and @chrisdholt for the input. I'll remove the commits from this PR and we can discuss update strategy elsewhere. |
eaf1df2
to
71abdfc
Compare
4792832
to
9a8b3c5
Compare
71abdfc
to
ff19b85
Compare
Description
This PR adds the new
fast-website
and itsdevDependencies
to the Yarn and Lerna workspaces.Motivation & context
Since we're temporarily using ultra-new additions from within the repo, we want to make sure our node_modules are pointing to the local neighbor instead of downloading the package independently.
Issue type checklist
Is this a breaking change?
Process & policy checklist