Keeping Your Project Updated

Step-by-Step Guide

1. Add the Upstream Repository

First, add the Indie Kit repository as a remote source:

If you're using Indie Kit:

git remote add ik https://github.com/indie-kit/indie-kit

If you're using B2B Kit:

git remote add ik https://github.com/indie-kit/b2b-boilerplate

2. Configure Pull Behavior

Set up git to use merge strategy for pulls:

git config pull.rebase false  # merge

3. Pull Updates

Pull the latest changes from the Indie Kit main branch:

If you're using Indie Kit:

git pull ik main

If you're using B2B Kit:

git pull ik b2b

4. Resolve Conflicts

You might encounter merge conflicts, which look like this:

Video Tutorial

5. Commit and Push

After resolving conflicts, commit and push your changes:

git add .
git commit -m "Update project"
git push

DONE!

Troubleshooting

If you encounter issues during the update process:

1. Make sure you have committed or stashed your local changes
2. Verify you're on the correct branch
3. Check that your working directory is clean

For visual guidance on resolving conflicts, refer to the video tutorial above.