1. Squash all your commits down to one
a. git log, look for commit of the last version of main from which you branched off, e.g. d52719
b. git rebase -i d52719
c. Change this
```
pick 22aa12b3 providers -> provider_ids
pick 5734fac7 only allow drop in reasons to be selected
pick 7d513550 whatever
```
to this
```
pick 22aa12b3 providers -> provider_ids
f 5734fac7 only allow drop in reasons to be selected
f 7d513550 whatever
```
2. Now, rebase off main
```
git fetch
git rebase -i origin/main
```
3. If any files in /_fresh or node_modules are different, just delete them, rebuild them, and commit
```
deno task rebuild
git add .
git commit
git rebase --continue
```
4. Done!