♻️ Updating the Codebase

Updating your ExtensionFast code to the latest version is simple, but may become trickier over time. As you make changes, you may face merge conflicts and need to be careful not to overwrite your custom code.

⚠️ Before You Update

Before updating your codebase, ensure your git repository is clean and that you have no uncommitted changes.

Commit or stash your changes before starting.

Add ExtensionFast as a Remote

To update your code, first, add the ExtensionFast repository as a remote:


git remote add upstream https://github.com/ExtensionFast/extensionfast-starter.git

Pull Latest Changes

Now, pull the latest updates from ExtensionFast:


git pull upstream main --allow-unrelated-histories --rebase

This will pull the latest updates from the ExtensionFast main branch and attempt to rebase your changes on top of them.

If you encounter any merge conflicts, you’ll need to resolve them manually. If you’re unsure how to do this, please refer to the Git documentation for merge conflicts or use a visual diff tool to help you resolve conflicts.

This will update your code with the latest changes. If there are merge conflicts, you’ll need to resolve them manually.

After Updating

Once your code is updated:

Check for overwrites: Make sure your custom code is not overwritten.
Update dependencies: Run this command to install updated dependencies:


npm install

Troubleshooting

If you run into issues:

Ensure all local changes are committed or stashed before updating.
If merge conflicts occur, use a tool like GitKraken or VS Code’s Git integration to help resolve them.
If you’re unsure, reach out to the ExtensionFast support team or ask a colleague familiar with Git.

💬 Additional Resources

Git Documentation – To better understand using Git
VS Code Git Integration – For using Git version control inside of VSCode