Guide Git version control workflows with commands for branching, merging, and conflict resolution.
npx skills add https://github.com/oriolrius/pki-manager-web --skill git-oriolrius
Please help me install this Agent Skill. Skill: Git Source: https://github.com/oriolrius/pki-manager-web/tree/main/.claude/skills/git Command: npx skills add https://github.com/oriolrius/pki-manager-web --skill git-oriolrius
Git provides a structured approach to version control, enabling teams to track changes, collaborate safely, and revert mistakes without disrupting ongoing work.
Initialize a repository, create a feature branch, commit changes with a clear message, and push to a remote repository.
High-intent search queries and answers about installing and using this skill.
To resolve merge conflicts in Git, identify the conflicting files, edit the code between the conflict markers to keep the desired changes, stage the resolved files, and commit the final merge. This allows safe integration of divergent work.
The best way to undo commits while keeping uncommitted work is using Git's soft reset or checkout commands. These safeguards allow you to safely revert history and protect ongoing changes in your working directory.
To rebase a feature branch onto main, switch to the feature branch and run the rebase command against main. This rewrites commit history by applying your changes on top of the latest main commits, requiring conflict resolution if overlapping edits exist.
You can safely rewrite Git history before pushing to a remote repository by using interactive rebasing with previews. This allows you to modify or squash local commits without disrupting shared remote branches or ongoing team work.
Feature branches isolate new development from the main branch, enabling teams to track changes and collaborate safely. This workflow prevents unfinished code from disrupting ongoing work and simplifies conflict resolution during merging.
A daily Git workflow requires checking status to see changes, staging modified files, committing with meaningful messages, and pushing to remote branches. This provides a structured approach to track changes and maintain reliable history.
MMA-Marketing-ProCreate GitHub repositories and link Vercel deployments for approved websites.
BarryrnStage changes, create conventional commits, and push to remote branches.
elijahmurrayCheck out pull request branches, review code changes, and apply feedback.
MMXCProvide essential Git commands for version control, branching, and collaboration.
