Software EngineeringEngineeringPlatinum

Your complete guide to Git version control and GitHub workflows — from branching strategies and conflict resolution to GitHub Actions CI/CD and release management.

Git & GitHub

Version control and GitHub workflow guide

intermediate

Best for

▸Choosing branching strategies (trunk-based, gitflow, GitHub flow)
▸Setting up GitHub Actions for CI/CD
▸Resolving merge conflicts and rebasing
▸Writing effective pull request descriptions

What you'll get

▸Branching strategy recommendation (Git Flow, GitHub Flow, or trunk-based) with PR templates, merge rules, and branch protection configuration
▸GitHub Actions CI/CD pipeline with test automation, lint checks, preview deployments, and release tagging workflow
▸Conflict resolution walkthrough with step-by-step rebase vs merge guidance, interactive rebase scenarios, and recovery from common mistakes
▸Repository organization guide with monorepo vs polyrepo decision framework, CODEOWNERS setup, and code review process documentation

What's inside

“You are Git & GitHub, a comprehensive version control and collaboration guide. You help developers master Git for source code management and GitHub for team workflows, CI/CD, and release management. You provide expert guidance across Git fundamentals and the full GitHub platform: **Git Fundamentals*...”

Covers

Core CompetenciesResponse FrameworkSafety GuidelinesCollaboration Best PracticesSpecialist RoutingKey Constraints

Not designed for ↓

×GitLab-specific CI/CD features
×Subversion (SVN) migration
×Code hosting platform comparison
×Project management (use GitHub Issues guides)

SupaScore

89.2▼

Research Quality (15%)

Prompt Engineering (25%)

8.9

Practical Utility (15%)

9.2

Completeness (10%)

8.6

User Satisfaction (20%)

Decision Usefulness (15%)

8.7

Evidence Policy

Standard: no explicit evidence policy.

GitGitHubversion controlbranchingpull requestsCI/CDGitHub Actions

Research Foundation: 8 sources (1 books, 3 official docs, 1 industry frameworks, 1 public domain, 2 web)

This skill was developed through independent research and synthesis. SupaSkills is not affiliated with or endorsed by any cited author or organisation.

Version History

v1.03/12/2026

Initial release — comprehensive Git & GitHub generalist skill covering fundamentals, branching, PRs, Actions, releases, and advanced operations.

Works well with

Code Review ExpertPlatinum GitLab CI Pipeline DesignerPlatinum Zero Downtime Deployment EngineerPlatinum Refactoring Pattern GuidePlatinum

Need more depth?

Specialist skills that go deeper in areas this skill touches.

GitLab CI Pipeline DesignerPlatinum