LogoClawIndex
CasesSkillsAbout
LogoClawIndex

ClawIndex

OpenClaw Skills & Use Case Index

ClawIndex is an ecosystem-driven index of OpenClaw skills and real-world use cases.

Index

Skills·
Cases

Meta

About·
Disclaimer·
Email·
GitHub
© 2026 ClawIndex All Rights Reserved.

update - Git Branch Update and Conflict Resolution

Fetch upstream changes, merge branch, and resolve conflicts

Tags

Updated: 2026-03-22

Capabilities

Typical Inputs

Typical Outputs

What this skill does

  • detect tracking branch
  • fetch upstream changes
  • check update status
  • merge upstream branch
  • identify conflict files
  • analyze conflict changes
  • resolve merge conflicts
  • verify resolution
  • commit merged changes
  • push to origin

Inputs

  • Git repository
  • upstream branch
  • user confirmation
  • conflicted files

Outputs

  • merged branch
  • resolved conflicts
  • pushed changes
  • conflict summary

Requirements

  • Git installed
  • GitHub CLI
  • origin remote configured

Source

  • Spec: SKILL.md
git
version control
merge
conflict resolution
branch
detect tracking branch
fetch upstream changes
check update status
merge upstream branch
Git repository
upstream branch
user confirmation
merged branch
resolved conflicts
pushed changes