skills.rest
marcocpt
marcocptCOMMUNITY
Explore all skills by this author →
GitHub

dd-git-ci

Runs pre-merge checks, SwiftLint strict validation, and conflict prediction for Git CI pipelines.

Updated Jun 11, 2026
Search Tags:#code quality#git#json output#swiftlint#ci#pre-merge check#conflict prediction
One-click install
npx skills add https://github.com/marcocpt/trae_skills --skill dd-git-ci-marcocpt
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: dd-git-ci
Source: https://github.com/marcocpt/trae_skills/tree/main/dd-git-ci
Command: npx skills add https://github.com/marcocpt/trae_skills --skill dd-git-ci-marcocpt

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve? Merging feature branches back into develop without systematic checks leads to broken builds, unresolved conflicts, unsynced documentation, and failed CI runs. This Skill enforces a complete pre-merge quality gate so every branch passes build, test, lint, and documentation checks before merging. ## Core Features & Use Cases - Pre-Merge Self-Check: Runs a checklist covering uncommitted files, test execution, doc synchronization, develop sync status, public file isolation, and cross-module declarations, outputting a PreMergeChecklist JSON where all_pass=false blocks the merge. - Conflict Prediction: Uses git merge-tree to detect merge conflicts before merging, classifying severity (high/medium/low) with explicit merge policies per level. - SwiftLint Strict & Doc Sync: Enforces swiftlint lint --strict on Swift changes and maps code modifications to the documentation that must be updated. - Use Case: Before merging a feature branch into develop, run the pre-merge check script to get a JSON report; if SwiftLint fails or conflicts exceed 5 files, the merge is blocked until resolved. ## Quick Start Ask the AI to run the pre-merge check on my current feature branch and tell me whether it is safe to merge into develop.

Frequently Asked Questions about dd-git-ci

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

FAQPage Schema
How do I run a pre-merge check before merging a Git branch?▼

Run bash pre-merge-check.sh from the dd-ai-git-workflow scripts directory to generate a PreMergeChecklist JSON. It verifies uncommitted files, tests, doc sync, develop sync, and conflict prediction; if all_pass is false, the merge is blocked.

How to detect Git merge conflicts before actually merging?▼

Use git merge-tree --write-tree --name-only origin/develop HEAD to predict conflicts without modifying the working tree. The skill classifies results by severity: more than 5 conflicting files blocks the merge, 3-5 requires manual confirmation, and 2 or fewer allows merging with a PR note.

When is SwiftLint strict mode required before merging?▼

SwiftLint strict mode (swiftlint lint --strict) is mandatory whenever the branch contains Swift code changes, and merging is forbidden if it fails. Documentation-only or configuration-only changes may skip this check.

What CI steps are recommended for a Swift Git workflow?▼

The recommended pipeline includes compile, SwiftLint (strict), unit tests, UI tests, merge-tree conflict prediction, and merge to develop. Steps 1-5 run on PR creation, step 6 on merge, and a daily scheduled job handles health checks and cleanup suggestions.

Can I use --ff-only instead of a merge commit for feature branches?▼

No. The skill explicitly forbids using --ff-only for feature merges; you must use --no-ff to preserve branch history. It also forbids skipping the pre-merge self-check and auto-cleaning branches without user confirmation.

Related Skills

Explore More Software Engineering Skills→
styrene-labstyrene-lab
47

git

Standardize git workflow metadata across commits, branches, tags, and changelogs.

Official
Intermediate
Veloxia-agencyVeloxia-agency

merge

Merge the winning agent branch into the base branch with no-ff merge and archive tags.

Community
Intermediate
AMC-JTCAMC-JTC

skillpack-check

Generates a JSON health report for gbrain installs by composing doctor and migration checks.

Community
Intermediate
d-o-hubd-o-hub
4

github-ci-guardrails

Validate atomic commits and GitHub Actions checks before merging pull requests.

Community
Intermediate