skills.rest
breath103
breath103COMMUNITY
Explore all skills by this author →
WebsiteGitHub

tss-update-template

Merge template/main into the current branch to sync with upstream template.

16|3|Updated Apr 24, 2026
Search Tags:#git#workflow#template#merge#conflicts#update-template
One-click install
npx skills add https://github.com/breath103/serverless-agent --skill tss-update-template
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: tss-update-template
Source: https://github.com/breath103/serverless-agent/tree/main/.claude/skills/tss-update-template
Command: npx skills add https://github.com/breath103/serverless-agent --skill tss-update-template

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This skill helps developers keep forks and local repositories synchronized with the official template by merging upstream updates into the current branch, ensuring consistency across projects.

Core Features & Use Cases

  • Template sync: Pulls in template changes to your branch to align configurations and scaffolding.
  • Conflict guidance: Provides a structured approach to resolve merge conflicts when updating the template.
  • Use Case: When starting a new project fork from the template, run this to pull the latest template updates into your branch.

Quick Start

Update your local branch by merging the upstream template into your current branch.

Frequently Asked Questions about tss-update-template

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I sync my local fork with upstream template updates?▼

To sync your local fork with template updates, merge the upstream template branch into your current local branch. This aligns your project configurations and scaffolding with the official template repository.

What do I need to merge an upstream template into my current git branch?▼

Merging an upstream template into your current branch requires a valid remote named template, a fetched template branch, and a clean working tree. These prerequisites ensure a safe merge operation without losing uncommitted changes.

How do I resolve merge conflicts when updating my project template?▼

When updating your project template causes merge conflicts, follow a structured conflict resolution approach to systematically reconcile discrepancies between your local branch changes and the upstream template updates.

Why does my template merge require a clean working tree?▼

A template merge requires a clean working tree to prevent data loss and ensure a safe merge operation. Uncommitted local changes can interfere with incoming template updates and compromise the synchronization process.

When should I pull upstream template changes into my local branch?▼

You should pull upstream template changes when starting a new project fork or when you need to align configurations and scaffolding. Run this sync process to pull the latest template updates into your branch and maintain project consistency.

Related Skills

Explore More Software Engineering Skills→
ahandselahandsel
1

git-pull-main

Synchronizes local Git feature branches with the remote main branch.

Community
Intermediate
nicolehaugennicolehaugen

merge-main

Merge main branch changes, resolve conflicts, and push merged branch.

Community
Intermediate
alibabaalibaba
5.3k

git-delegation

Delegate authenticated Git operations to a Manager agent.

Official
Intermediate
jkomorosjkomoros
9

land-branch

Rebase a feature branch onto main and merge via pull request.

Community
Intermediate