mirror of
https://github.com/LeoYeAI/openclaw-master-skills.git
synced 2026-07-27 22:15:43 +00:00
- Added 175 new high-quality skills across all categories - 14 distinct categories: AI, Search, Productivity, Dev, Marketing, Media, Finance, Communication, Smart Home, Memory, Security, Data, Social, Other - Updated all language READMEs and SKILL.md - Weekly update by MyClaw.ai
1.4 KiB
1.4 KiB
Collaboration Traps
Push/Pull
git pull= fetch + merge — can create unexpected merge commitsgit pull --rebaseavoids merge commits but can have conflicts- Push rejected for non-fast-forward ≠ you need force — pull first
--forceoverwrites others' history —--force-with-leaseis safer
Force Push
--forceignores others' changes — coworkers' commits lost--force-with-leasefails if remote changed — safer but not foolproof- Force push to main/master = broken CI/CD references, failed deploys
- Branch protection on GitHub/GitLab prevents force push — always configure
Remote Branches
git fetchdoesn't update working directory — only refs- Branch tracking doesn't update automatically if remote renames
originis convention, not requirement — other remotes can existgit remote prune origincleans refs but not local branches
Code Review
- Push during review = new commits not necessarily reviewed
- Force push during review = diff changes, comments may become obsolete
- Approve before CI complete = bugs merged
- Squash merge loses individual commit history
Team Coordination
- Multiple people on same branch = constant conflicts
- No branch naming convention = chaos in long-running projects
- Forgetting to pull before starting work = divergent history
- Rebasing shared branch without warning = teammates' work broken