Provide Git commands for branching, merging, rebasing, and conflict resolution.
npx skills add https://github.com/asgarovf/locusai --skill git-essentials-asgarovf
Please help me install this Agent Skill. Skill: git-essentials Source: https://github.com/asgarovf/locusai/tree/main/skills/git-essentials Command: npx skills add https://github.com/asgarovf/locusai --skill git-essentials-asgarovf
This Skill provides comprehensive guidance and commands for complex Git operations, helping users navigate branching, merging, rebasing, and conflict resolution efficiently.
git reset, git revert, and git reflog.Use the git-essentials skill to create a new feature branch named 'feat/123-add-user-auth' from the main branch.
High-intent search queries and answers about installing and using this skill.
To resolve a merge conflict during a git rebase, you must manually edit the conflicting files to keep the desired changes, stage the resolved files, and continue the rebase. This skill provides strategies and commands to effectively resolve these conflicts.
Git reflog records a history of reference updates, allowing you to find the commit hash of your deleted branch. You can recover the branch by running git reset --hard <commit-hash> to restore your repository state to that specific point.
You clean up commit history with interactive rebase by squashing, rewording, or dropping commits to ensure atomic commits. This skill assists in cleaning up commit history using interactive rebase for a more readable project timeline.
Use git reset to move your branch pointer backward and discard commits locally, while git revert creates a new commit that undoes previous changes. This skill guides users on recovery methods using reset, revert, and reflog to avoid rewriting shared history.
Standard git branch naming conventions typically use prefixes like 'feat/' for features and 'fix/' for fixes, often including an issue number. This skill helps create and maintain branches according to these best practices, such as 'feat/123-add-user-auth'.
0xRayAIAutomate Git branching, merging, and repository synchronization workflows.
the-agency-aiVerify merged pull requests, merge origin updates, and create GitHub releases.
etylsarinEnforce feature-branch pull request workflows and prevent direct commits to main.
ARCASSystemsAutomates git commits for non-technical users via a simplified interface.