Before you update your code base, make sure your git repository is clean and that you have no uncommitted changes.
Use the CLI
This can be difficult to do manually, so we’ve created a script to help you, this is the recommended way to update your project.Terminal
Use Git
Add the upstream remote pointing to the original repository to pull updates:Terminal
If you have done this in the setup before, you can skip this step.Update your repository from the ShipThing repository:
Terminal
Conflicts in pnpm-lock.yaml?If you find conflicts in the Your lock file will now reflect both your changes and the updates from the upstream repository.
pnpm-lock.yaml
file, accept either of the two changes (avoid manual edits), then run:Terminal
Because ShipThing is a boilerplate and not a library, you’ll likely need to manually merge the changes you’ve made with the changes from the update.