Git Workflow

Git Workflow

This skill handles git operations securely using mutex locking for commits to prevent concurrency issues.

1. Commit Changes

Context

• Locking: Uses .git-commit.lock to ensure exclusive access.
• Scope: commits should only include files changed in the current task.

Instructions

1. Acquire Lock:

   .\.agent\skills\git-workflow\scripts\acquire-commit-lock.ps1
   if ($LASTEXITCODE -ne 0) { throw "Failed to acquire commit lock" }
   

2. Analyze Changes:

   • Verify status and diffs.
   • Stage ONLY relevant files (don't use git add .).

3. Execute Commit:

   # Single Line
   .\.agent\skills\git-workflow\scripts\execute-git-commit.ps1 -Files @("file1", "file2") -Message "Commit message."
   
   # Multi Line
   .\.agent\skills\git-workflow\scripts\execute-git-commit.ps1 -Files @("file1", "file2") -Message "Title" -AdditionalMessages @("Details")
   

2. Sync with Remote

Instructions

1. Check State: git status, git log
2. Pre-Sync: Ensure clean working tree (commit or stash).
3. Fetch & Pull:

   git fetch origin
   git pull --rebase origin main
   

4. Push:

   git push origin main
   

5. Combined (Quick):

   git fetch origin && git pull --rebase origin main && git push origin main
   

Converted and distributed by TomeVault — claim your Tome and manage your conversions.