git-workflow

Git conflict resolution involves identifying conflicting changes, selecting which version to keep, and completing the merge or rebase. This Skill provides commands like `/git:conflicts` and `git:conflict-resolver` to streamline the process and reduce manual errors across your repository.

Rebasing rewrites commit history to create a linear timeline, useful for cleaning up before merging. This Skill offers `/git:rebase-all` to rebase multiple branches and delegates to `git:rebaser` for standardized, error-resistant rebasing across your workflow.

Standardized commits enforce consistent messaging and metadata across team repositories. This Skill guides `/git:commit` and `git:commit-handler` to automate commit creation with enforced conventions, reducing formatting errors and improving repository history clarity.

Git worktrees allow parallel work on multiple branches without switching context. This Skill provides `/git:worktree` and `/git:clean-worktrees` commands to create, organize, and clean up worktrees, simplifying branch lifecycle management across your development environment.

Yes. This Skill standardizes Git workflow operations—commits, rebasing, conflict resolution, and branch management—across both team and individual contexts, applying consistently whether you work in shared repositories or solo projects.

Manual Git operations like conflict resolution, rebasing, and worktree management are error-prone and time-consuming. Workflow automation reduces developer frustration, enforces consistency across CI pipelines and repositories, and delegates complex tasks to specialized handlers.