# Git Sync Guardian

> Use this tool when you need to synchronize your local Git branch with the main repository while minimizing conflicts and ensuring a smooth workflow. It monitors for new commits, analyzes conflict risk, and automatically syncs your branch via rebase or merge, handling stash and conflict resolution. Ideal for developers working on collaborative projects who want to stay up-to-date with the latest changes while avoiding merge conflicts.

Canonical page: https://skillsregistry.net/skills/mamisedra-git-sync-guardian  
JSON: https://api.skillsregistry.net/v1/skills/mamisedra-git-sync-guardian

## Description

Monitors origin/main for new commits, analyzes conflict risk with local AI (Ollama), and syncs your working branch via rebase or merge with automatic stash/unstash and conflict resolution options.

## Trust

- **Trust score (0–1):** 0.69
- **Verification tier:** scanned
- **Last scanned:** 2026-09-03

## Facts

- **Version:** 1.0.0
- **Skill type:** atomic
- **Execution layer:** mcp-remote
- **Runtime environment:** api
- **Category:** monitoring
- **Updated:** 2026-09-03

## Source

- **Source listing:** [Glama](https://glama.ai/mcp/servers/mh4kx373pp)
- **Repository:** <https://github.com/Mamisedra/git-sync-guardian>

## Use it

Resolve this record through the SkillsRegistry MCP server (no auth, read-only):

```
claude mcp add --transport http --scope user skillsregistry https://api.skillsregistry.net/mcp
```

```json
{
  "jsonrpc": "2.0",
  "id": 1,
  "method": "tools/call",
  "params": {
    "name": "get_skill",
    "arguments": {
      "slug": "mamisedra-git-sync-guardian"
    }
  }
}
```

REST: `GET https://api.skillsregistry.net/v1/skills/mamisedra-git-sync-guardian` · pull for local use: `GET https://api.skillsregistry.net/v1/skills/mamisedra-git-sync-guardian/pull`

---
SkillsRegistry indexes agent skills from public registries and GitHub. Skills we have analysed are scanned with Circle-IR and scored on six dimensions; each listing states its scan coverage. More: https://skillsregistry.net/llms.txt