Git Workflow Automation

Overview

This skill automates common Git workflows and provides expert guidance on best practices for version control.

When to Use This Skill

Branching Strategies

Git Flow

```

main (production-ready code)

├── develop (integration branch)

│ ├── feature/* (feature branches)

│ └── release/* (release preparation)

└── hotfix/* (urgent fixes)

```

GitHub Flow

```

main (always deployable)

└── feature/* (short-lived branches)

```

Common Operations

Creating a Feature Branch

```bash

git checkout -b feature/user-authentication

```

Syncing with Upstream

```bash

git checkout main

git pull origin main

git checkout feature/user-authentication

git rebase main

```

Resolving Merge Conflicts

1. Identify conflicted files: `git status`

2. Open files and look for conflict markers: `<<<<<<<`, `=======`, `>>>>>>>`

3. Manually resolve conflicts by keeping desired changes

4. Stage resolved files: `git add .`

5. Complete the merge: `git rebase --continue` or `git merge --continue`

Pull Request Best Practices

Release Management

Scripts Available

References