Merge changes from this template repository

This page illustrates how to merge changes from this template repository.

1. Add this template repository to your repository

   git remote add template https://github.com/xslet/xslt-repo-template.git

2. Fetch the changes

   git fetch --all
   

3. Merge the changes

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

4. Skip the changes

   If your repository have files each of which has same name but different content and is not target of marge, reset and restore those files.

   git reset file1 file2 ...
   git restore file1 file2 ...
   

5. Resolve conflicts

   Edit files to resolve conflicts.

   vi file3 file4 ...
   

6. Commit

   git commit