Syncing

Author Kit is a Github repository template. As such, when you use it, you will start with a clean history.

There may be times you want to get the latest from the template project itself.

Add the template as a remote

$ git remote add template https://github.com/aemsites/author-kit.git

Sync

Get the latest branches from the template

$ git fetch template

Option 1 - merge everything

git merge template/main --allow-unrelated-histories

Note: the unrelated histories is important as these will be two separate projects with two separate histories.

Option 2 - selective merge

git checkout template/main -- path/to/file.ext