Update the documentation template¶
After you've applied the template, you can update it to a new version by:
Update the project generated using Copier¶
When you used Copier to generate the project, you can also use Copier to update it.
Update the cloned template¶
When you cloned the template repository, it can be updated through Git.
Template Remote¶
First ensure the template repository is added as a remote for the documentation repository:
origin git@github.com:MyUsername/my-docs-repo.git (fetch)
origin git@github.com:MyUsername/my-docs-repo.git (push)
template git@github.com:Virtlink/zensical-docs-template.git (fetch)
template git@github.com:Virtlink/zensical-docs-template.git (push)
If not, add the template remote repository:
Merge latest changes¶
Fetch the changes in the template remote:
Then merge the latest changes from the template's main branch into your repository:
Unrelated Histories
If you get the error fatal: refusing to merge unrelated histories, then your documentation repository was never based on the template. However, you can force Git to merge the template anyway by using this command:
Finally, use the Git command line to fix any merge conflicts, and commit the result.