Something feels wrong with the rebase, it's saying this PR has 90 commits?

Maybe you should squash the original calendar commits of this PR and drop all the other commits, and then rebase. It would make the whole process less painful, no?

ya I tried to reset to when I started this PR rebased your changes then pulled in the calendar changes.

Yeah, but still @benhalverson it looks like on the commits tab, the whole history is still here... If you want, I could try to fix the tree of this branch for you 😄

And also regarding the peerDependencies conflict, you can use the overrides option of package.json. Something like:

{
  ....
  "overrides": {
    "react-big-calendar": {
      "react": "$react"
    }
  }
}

If you want, I could try to fix the tree of this branch for you 😄

If you don't mind. I'm ok with it 👍🏻

This pull request is stale because it has been open for 30 days with no activity.

This pull request is stale because it has been open for 30 days with no activity.

I'm closing this PR in favour of #2900