Update the codebase

Learn how to update the codebase from the DirEasy repo to the latest updates and features.

Before you update your code base, make sure your git repository is clean and that you have no uncommitted changes.

Use Git

Add the upstream remote pointing to the original repository to pull updates:

Terminal

git remote add origin https://github.com/focusapps/DirEasy

If you have done this in the setup before, you can skip this step.

Update your repository from the DirEasy repository:

Terminal

- Pull changes
git pull upstream main
 
- Merge changes
git merge upstream/main

Conflicts in pnpm-lock.yaml?

If you find conflicts in the pnpm-lock.yaml file, accept either of the two changes (avoid manual edits), then run:

Terminal

pnpm i

Your lock file will now reflect both your changes and the updates from the upstream repository.

Because DirEasy 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.