Pull Updates

To pull updates from the original repository, you need to add it as a remote. This allows you to fetch and merge changes from the original repository into your fork.

1. Adding the original repository as a remote

git remote add origin https://github.com/NuxtStarterKit/nuxtstarterkit.git

This command adds the original repository as a remote named origin.

2. Fetch the latest changes

Run the following command to fetch the latest changes from the original repository:

git fetch origin

3. Create a new branch

I would recommend creating a new branch for the updates. This way, you can test the changes before merging them into your main branch:

# Switch to the main branch
git checkout main

# Create a new branch for the updates
git checkout -b update-branch

4. Merge the changes

Now, you can merge the changes from the original repository into your new branch:

git pull origin main --allow-unrelated-histories --no-rebase

With this command, you are merging the changes from the main branch of the original repository into your current branch. The --allow-unrelated-histories flag allows merging two unrelated histories, and the --no-rebase flag prevents rebasing the changes.

5. Resolve any conflicts

If there are any merge conflicts, Git will notify you. You will need to resolve these conflicts manually with your tool of choice (e.g., VSCode, WebStorm, etc.).

6. Test the changes

After resolving any conflicts, it's important to test the changes to ensure everything works as expected. Run your application and check for any issues.

7. Merge the updates into your main branch

Once you have tested the changes and resolved any conflicts, you can commit the changes to your branch:

# Switch back to the main branch
git checkout main

# Merge the updates from the temporary branch
git merge update-branch