โ† All skills
Tencent SkillHub ยท Developer Tools

Git (Essentials + Workflows + Advanced)

Full version control coverage with essential commands, team workflows, branching strategies, and recovery techniques.

skill openclawclawhub Free
0 Downloads
0 Stars
0 Installs
0 Score
High Signal

Full version control coverage with essential commands, team workflows, branching strategies, and recovery techniques.

โฌ‡ 0 downloads โ˜… 0 stars Unverified but indexed

Install for OpenClaw

Quick setup
  1. Download the package from Yavira.
  2. Extract the archive and review SKILL.md first.
  3. Import or place the package into your OpenClaw setup.

Requirements

Target platform
OpenClaw
Install method
Manual import
Extraction
Extract archive
Prerequisites
OpenClaw
Primary doc
SKILL.md

Package facts

Download mode
Yavira redirect
Package format
ZIP package
Source platform
Tencent SkillHub
What's included
SKILL.md, advanced.md, branching.md, collaboration.md, commands.md, conflicts.md

Validation

  • Use the Yavira download entry.
  • Review SKILL.md after the package is downloaded.
  • Confirm the extracted package contains the expected setup assets.

Install with your agent

Agent handoff

Hand the extracted package to your coding agent with a concrete install brief instead of figuring it out manually.

  1. Download the package from Yavira.
  2. Extract it into a folder your agent can access.
  3. Paste one of the prompts below and point your agent at the extracted folder.
New install

I downloaded a skill package from Yavira. Read SKILL.md from the extracted folder and install it by following the included instructions. Tell me what you changed and call out any manual steps you could not complete.

Upgrade existing

I downloaded an updated skill package from Yavira. Read SKILL.md from the extracted folder, compare it with my current installation, and upgrade it while preserving any custom configuration unless the package docs explicitly say otherwise. Summarize what changed and any follow-up checks I should run.

Trust & source

Release facts

Source
Tencent SkillHub
Verification
Indexed source record
Version
1.0.8

Documentation

ClawHub primary doc Primary doc: SKILL.md 15 sections Open source page

When to Use

Use when the task involves Git repositories, branches, commits, merges, rebases, pull requests, conflict resolution, history inspection, or recovery. This skill is stateless and should be applied by default whenever Git work is part of the job.

Quick Reference

TopicFileEssential commandscommands.mdAdvanced operationsadvanced.mdBranch strategiesbranching.mdConflict resolutionconflicts.mdHistory and recoveryhistory.mdTeam workflowscollaboration.md

Core Rules

Never force push to shared branches โ€” Use --force-with-lease on feature branches only Commit early, commit often โ€” Small commits are easier to review, revert, and bisect Write meaningful commit messages โ€” First line under 72 chars, imperative mood Pull before push โ€” Always git pull --rebase before pushing to avoid merge commits Clean up before merging โ€” Use git rebase -i to squash fixup commits

Team Workflows

Feature Branch Flow: git checkout -b feature/name from main Make commits, push regularly Open PR, get review Squash and merge to main Delete feature branch Hotfix Flow: git checkout -b hotfix/issue from main Fix, test, commit Merge to main AND develop (if exists) Tag the release Daily Sync: git fetch --all --prune git rebase origin/main # or merge if team prefers

Commit Messages

Use conventional commit format: type(scope): description Keep first line under 72 characters Types: feat, fix, docs, style, refactor, test, chore

Push Safety

Use git push --force-with-lease instead of --force โ€” prevents overwriting others' work If push rejected, run git pull --rebase before retrying Never force push to main/master branch

Conflict Resolution

After editing conflicted files, verify no markers remain: grep -r "<<<\|>>>\|===" . Test that code builds before completing merge If merge becomes complex, abort with git merge --abort and try git rebase instead

Branch Hygiene

Delete merged branches locally: git branch -d branch-name Clean remote tracking: git fetch --prune Before creating PR, rebase feature branch onto latest main Use git rebase -i to squash messy commits before pushing

Safety Checklist

Before destructive operations (reset --hard, rebase, force push): Is this a shared branch? โ†’ Don't rewrite history Do I have uncommitted changes? โ†’ Stash or commit first Am I on the right branch? โ†’ git branch to verify Is remote up to date? โ†’ git fetch first

Common Traps

git user.email wrong โ€” Verify with git config user.email before important commits Empty directories โ€” Git doesn't track them, add .gitkeep Submodules โ€” Always clone with --recurse-submodules Detached HEAD โ€” Use git switch - to return to previous branch Push rejected โ€” Usually needs git pull --rebase first stash pop on conflict โ€” Stash disappears. Use stash apply instead Large files โ€” Use Git LFS for files >50MB, never commit secrets Case sensitivity โ€” Mac/Windows ignore case, Linux doesn't โ€” causes CI failures

Recovery Commands

Undo last commit keeping changes: git reset --soft HEAD~1 Discard unstaged changes: git restore filename Find lost commits: git reflog (keeps ~90 days of history) Recover deleted branch: git checkout -b branch-name <sha-from-reflog> Use git add -p for partial staging when commit mixes multiple changes

Debugging with Bisect

Find the commit that introduced a bug: git bisect start git bisect bad # current commit is broken git bisect good v1.0.0 # this version worked # Git checks out middle commit, test it, then: git bisect good # or git bisect bad # Repeat until Git finds the culprit git bisect reset # return to original branch

Quick Summary

git status -sb # short status with branch git log --oneline -5 # last 5 commits git shortlog -sn # contributors by commit count git diff --stat HEAD~5 # changes summary last 5 commits git branch -vv # branches with tracking info git stash list # pending stashes

Related Skills

Install with clawhub install <slug> if user confirms: gitlab โ€” GitLab CI/CD and merge requests docker โ€” Containerization workflows code โ€” Code quality and best practices

Feedback

If useful: clawhub star git Stay updated: clawhub sync

Category context

Code helpers, APIs, CLIs, browser automation, testing, and developer operations.

Source: Tencent SkillHub

Largest current source with strong distribution and engagement signals.

Package contents

Included in package
6 Docs
  • SKILL.md Primary doc
  • advanced.md Docs
  • branching.md Docs
  • collaboration.md Docs
  • commands.md Docs
  • conflicts.md Docs