HomeAgents StoreSkills StoreTeams StoreBlog
Get Start

Product

Agents StoreSkills Store

Community

XDiscord
↗MossAI Tools↗Dang.ai↗Viesearch↗AIDirs↗Findly.tools↗AI Agents Directory↗Twelve Tools↗Wired Business↗ToolPilot.ai↗AIDirectori.es↗Indie.Deals↗DomainRank↗Aura++
YOLOX - Featured on Startup FameListed on Turbo0Featured on toolfame.comFeatured on saasfame.comFeatured on FoundrList
Terms of Service|Privacy Policy

© 2026 YOLOX SYSTEM. ALL RIGHTS RESERVED.

HomeAgents StoreSkills StoreTeams StoreBlog
Get Start
Home/Skill Store/Developer Tools/git-workflow
Skill avatar

git-workflow

Developer Tools

Gives your agent the ability to manage complete Git lifecycles, from branch creation and commits to complex merges and conflict resolution.

When to use

  • When collaborating with a team using branches, pull requests, and merges

  • When you need to resolve merge conflicts or rebase your work onto a main branch

  • When you want to clean up your commit history or recover lost work

How to use

  1. 1

    Identify the current state of your repository using status and log commands

  2. 2

    Choose the appropriate workflow step, such as branching, committing, or merging

  3. 3

    Follow the agent's guided instructions for complex tasks like rebasing or conflict resolution

  4. 4

    Clean up your local and remote environments after successfully merging your work

Example conversation

case
You

You

I have conflicts after rebasing my feature branch onto main. How do I fix this?

git-workflow

Agent

I'll help you resolve those conflicts. First, use 'git status' to identify the conflicted files. I'll guide you through opening each file, choosing between your changes and the incoming ones, and then using 'git add' and 'git rebase --continue' to complete the process safely.

FAQ

Related Skills

View More
workflow-automation
workflow-automationProductivity

Gives your agent the ability to automate development tasks using npm scripts, Makefiles, and GitHub Actions.

using-git-worktrees
using-git-worktreesDeveloper Tools

Gives your agent the ability to set up isolated git worktrees for feature development without switching branches in your main workspace.

git-commit
git-commitDeveloper Tools

Gives your agent the ability to write professional, structured commit messages following conventional standards for clear version control history.

git-submodule
git-submoduleDeveloper Tools

Gives your agent the ability to manage external Git repositories as submodules within your main project for modular dependency management.

git-flow-branch-creator
git-flow-branch-creatorDeveloper Tools

Gives your agent the ability to analyze your code changes and automatically create semantic Git Flow branches with appropriate naming conventions.

Product

Agents StoreSkills Store

Community

XDiscord
↗MossAI Tools↗Dang.ai↗Viesearch↗AIDirs↗Findly.tools↗AI Agents Directory↗Twelve Tools↗Wired Business↗ToolPilot.ai↗AIDirectori.es↗Indie.Deals↗DomainRank↗Aura++
YOLOX - Featured on Startup FameListed on Turbo0Featured on toolfame.comFeatured on saasfame.comFeatured on FoundrList
Terms of Service|Privacy Policy

© 2026 YOLOX SYSTEM. ALL RIGHTS RESERVED.