Skills tagged: merge

• pdf-generator - Create and manipulate PDF files programmatically

  pdfdocumentformfillable

  ★ 18 · Updated 2026-09-22

  Programmatically generate PDFs, fill forms, extract content, add watermarks or overlays, and merge documents.

  ⚙ Fill PDF forms⚙ Extract PDF content and metadata⚙ Add watermarks and overlays
• git-merge-resolving - Resolving Git merge and rebase conflicts

  gitmergeconflict-resolutionrebase

  ★ 0 · Updated 2026-09-21

  Resolves Git merge and rebase conflicts by analyzing commit intent, handling union conflicts, regenerating generated files, and attributing test failures.

  ⚙ Analyze commit intent from history⚙ Port additions into evolved lineage⚙ Combine union textual conflicts
• merge-main - Merge latest default branch changes into current branch.

  gitmergeversion-controlconflict-resolution

  ★ 0 · Updated 2026-09-13

  Merges latest default branch changes into current branch, resolves conflicts, reviews applicability, and pushes.

  ⚙ Detect default branch⚙ Check uncommitted changes⚙ Fetch remote changes
• merge - Merge Changes

  gitmergebranchworktree

  ★ 2 · Updated 2026-09-11

  Merge changes from the topic branch to the merge base branch.

  ⚙ Commit uncommitted changes⚙ Merge topic branch into base⚙ Resolve merge conflicts
• resolving-merge-conflicts - Resolve Git Merge and Rebase Conflicts

  gitmergerebaseconflict-resolution

  ★ 590 · Updated 2026-09-09

  Resolves in-progress Git merge or rebase conflicts while preserving original intent and running automated checks.

  ⚙ Inspect merge and rebase status⚙ Analyze commit history and intent⚙ Resolve conflicting code hunks
• crowdin-merge - Merge and review Crowdin translations

  localizationtranslationi18nCrowdin

  ★ 6 · Updated 2026-06-15

  Merge Crowdin l10n_develop PR locally, reconcile catalogs, review translations, and push to Crowdin

  ⚙ merge develop branch⚙ reconcile translation catalogs⚙ check translation deletions
• merging-worktrees - Merge Parallel Worktrees to Unified Branch

  gitmergeworktreeparallel development

  ★ 4 · Updated 2026-05-09

  Merges parallel worktrees with conflict detection, 3-way analysis, and ordered resolution

  ⚙ build dependency graph⚙ create merge plan⚙ execute sequential merges
• ai-pr - Governed PR workflow with automation

  gitpull-requestcimerge

  ★ 602 · Updated 2026-03-25

  Create governed pull requests with commit pipeline, pre-push gates, and auto-complete squash merge

  ⚙ execute commit pipeline⚙ run pre-push checks⚙ create pull request
• dev-swarm-git-merge - Git Partial and Clean Merge Skill

  gitmergeversion controldevops

  ★ 18 · Updated 2026-03-22

  Execute git partial merges of specific folders and squash merges for clean single-commit branch integration

  ⚙ checkout specific folders from branch⚙ perform squash merge⚙ switch target branch
• dev-swarm-git-merge - Git Partial and Squash Merge Tool

  gitversion controlmergebranch

  ★ 602 · Updated 2026-03-22

  Execute git partial merges for specific folders and squash merges for clean single-commit integration across branches

  ⚙ checkout specific folders⚙ checkout specific files⚙ switch branches
• merge - Squash merge feature to main/develop

  gitmergebranchversion-control

  ★ 4 · Updated 2026-03-22

  Performs squash merge of current feature branch to main or develop branch with worktree support

  ⚙ check uncommitted changes⚙ switch to target branch⚙ pull target branch
• git-github-conflict-resolve - Git Merge Conflict Resolution

  gitmergeconflictresolution

  ★ 0 · Updated 2026-03-22

  Identify and resolve Git merge conflicts with multiple resolution strategies

  ⚙ detect conflict markers⚙ list conflicted files⚙ view conflict details
• update - Git Branch Update and Conflict Resolution

  gitversion controlmergeconflict resolution

  ★ 2 · Updated 2026-03-22

  Fetch upstream changes, merge branch, and resolve conflicts

  ⚙ detect tracking branch⚙ fetch upstream changes⚙ check update status
• git-flow - Git Workflow Branching Strategies Guide

  gitversion controlbranchmerge

  ★ 75 · Updated 2026-03-20

  Guide Git branching strategies, naming conventions, and merge operations

  ⚙ check unmerged branches⚙ synchronize latest code⚙ create feature branch
• coalesce - Merge Related Articles into Unified Piece

  contentmergearchivearticles

  ★ 18 · Updated 2026-03-19

  Combine multiple related articles into one unified piece and archive originals to preserve URLs

  ⚙ validate inputs⚙ analyze source content⚙ plan merge
• finishing-a-development-branch - Complete Development Work with Structured Merge Options

  gitdevelopmentworkflowmerge

  ★ 581 · Updated 2026-03-09

  Guide completion of development work by presenting structured options for merge, PR, or cleanup after implementation is done and tests pass

  ⚙ verify test results⚙ determine base branch⚙ present completion options
• finishing-a-development-branch - Finishing a Development Branch with Workflow Options

  developmentgitbranchmerge

  ★ 6 · Updated 2026-03-09

  Clean branch wrap-up with workflow options when a feature branch is complete and ready to merge.

  ⚙ create pull request⚙ rebase feature branch⚙ update documentation
• openspec-sync-specs - Sync delta specs from changes to main specs

  specificationsyncmergeopenspec

  ★ 602 · Updated 2026-03-09

  Apply delta spec changes from openspec changes to main specifications

  ⚙ read delta spec files⚙ edit main spec files⚙ merge requirement changes
• beads-integrator - Beads Integrator - Safe Git Branch Merging Tool

  integrationmergegitversion-control

  ★ 0 · Updated 2026-02-23

  Merge Beads task branches into main/master safely with serialized workflow

  ⚙ checkout base branch⚙ pull latest changes⚙ rebase task branch
• integration-merge-manager - Parallel Branch Integration and Merge Management

  integrationmergeconflict-resolutionversion-control

  ★ 0 · Updated 2026-02-12

  Manages pre-main integration of parallel branches including merge planning, conflict resolution, and validation.

  ⚙ create integration branch⚙ switch to integration branch⚙ merge track branches

Scroll to load more