How do you update a template?

[twhite96]

Looking to pull down the latest version but don't understand how.

[madrilene]

I'd do it like that:

1. Enable git rerere globally (recommended):

   git config --global rerere.enabled true

2. Set up the upstream if you haven't already:

   git remote add upstream https://github.com/madrilene/eleventy-excellent

3. Fetch the latest changes from upstream:

   git fetch upstream

4. Create a new branch for the update:

   git checkout -b update-to-v2

5. Merge the updates into this new branch:

   git merge upstream/main

6. If merge conflicts arise, resolve them. Git rerere will record your conflict resolutions.
7. Once everything works well, merge the update branch into main:

   git checkout main
   git merge update-to-v2

8. Push your updated main branch to (your) GitHub:

   git push origin main

If you want to back out: git rebase --abort

[madrilene]

Hi, I'll close the issue for now, feel free to reopen if anything is still unclear.