Template

Files

T

✨ Adds new prompts for auditing, converting controllers, and logging

Introduces several new markdown prompt files to enhance the
repository's capabilities. These include instructions for auditing
files, converting MVC controllers to Minimal API endpoints, and
refactoring inline logger calls to use LoggerMessage-generated
methods. This improves code quality and aligns with project
conventions.

2026-04-25 16:31:12 +03:00

2.2 KiB

Raw Blame History

description, agent

description	agent
Sync the current repository with upstream changes from kritikos-io/templates-dotnet, with conflict-resolution guidance.	agent

Sync From Template

Pull updates from the upstream kritikos-io/templates-dotnet repository, following the workflow documented in the root README.md.

Steps

1. Verify the `template` Remote

git remote -v | grep template

If absent, add it and warn the user that the first sync requires --allow-unrelated-histories:

git remote add template https://github.com/kritikos-io/templates-dotnet
git fetch --all

2. Check Working Tree

git status must be clean. If it isn't, stop and ask the user to commit or stash before continuing.

3. Pull

First-time sync (template remote was just added):

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

Subsequent syncs:
```
git pull template main
```

4. Resolve Conflicts

Common conflict zones, with resolution guidance:

File / area	Strategy
`Solution.slnx`, `Solution.code-workspace`	Keep local — these are project-specific. Re-apply any new entries from upstream manually.
`Directory.Build.props`, `Directory.Build.targets`, `Directory.Packages.props`	Take upstream as the base, re-apply project-specific overrides on top.
`.github/instructions/`, `.github/skills/`, `.github/prompts/`	Take upstream; project-specific guidance should live in a separate file, never as edits to template-shipped files.
`README.md`, `LICENSE.md`, `icon.png`	Keep local — these are project-specific.
`docker/Dockerfile`	Take upstream; project-specific compose lives in `docker/compose.*.yaml`.

When a conflict needs human judgement, list it with file path + decision options rather than guessing.

5. Verify

dotnet restore --force-evaluate
dotnet build
dotnet test

If lock files moved, commit packages.lock.json updates.

6. Commit

Use a single merge commit; do not squash. Subject:

🔀 Syncs with kritikos-io/templates-dotnet

(Per copilot-commit-message-instructions.md: gitmoji, third-person imperative.)

2.2 KiB Raw Blame History