Automates git workflow with staged changes, intelligent commit messages, pull with merge conflict resolution, and push to remote. Use this skill when you need to perform a complete git synchronization workflow.
This skill performs a complete git synchronization workflow with intelligent change summarization and conflict resolution.
The Custom Git Sync skill executes the following steps in order:
Execute git add . to stage all untracked and modified changes.
Before committing, analyze the staged changes using git diff --cached or git diff --cached --stat to understand what was changed. Generate a concise, meaningful commit message that summarizes all the changes made, then execute git commit -m "message" with your generated message.
The commit message should:
Example commit messages:
Execute git pull origin <current-branch> to fetch and merge the latest changes from the remote repository.
If merge conflicts occur during the pull:
git status to identify conflicted filesgit add <file> to mark conflicts as resolvedgit commit (no message needed for merge commits)For merge conflict resolution, prefer keeping changes that:
Once the merge is complete, execute git push origin <current-branch> to push the synchronized changes to the remote repository.
/git sync