Skip to content
IRC-Coding IRC-Coding
Git Subversion Commit Branch Merge Rebase

Git Version Control Explained: Branches, Merge & Pull Requests

Master Git version control: commits, branches, merge vs. rebase, pull requests, conflict resolution, branch protection & release management.

S

schutzgeist

2 min read
Git Version Control Explained: Branches, Merge & Pull Requests

Version Control Systems

This article is a conceptual explanation of version control systems – including exam questions, core components, and tags.

In a Nutshell

A version control system stores every change traceable, enables parallel work with branches, and ensures traceability, recoverability, and collaboration.

Compact Technical Description

  • DVCS (Git): complete history available locally
  • Centralized (Subversion): history primarily on the server

Core operations:

  • Commit (atomic change)
  • Branch (parallel development)
  • Merge or Rebase (integration)
  • Tag (mark release)

Team governance:

  • Pull Requests + Reviews
  • Branch protection + status checks (CI)
  • signed commits

Traceability: Ticket references in commits/PRs + releases via tags/notes.

Exam-Relevant Key Points

  • Explain Git vs. SVN
  • Commit contains metadata + hash
  • Merge vs Rebase (history)
  • Conflict resolution (3-way merge + tests)
  • PRs/Reviews for quality/compliance
  • Releases: tags + semver
  • Security: permissions, signatures, audit trails

Core Components

  1. Repository (local/remote)
  2. Working tree + staging area
  3. Commits
  4. Branches
  5. Merge
  6. Rebase
  7. Tags
  8. Access control
  9. Hooks/automation
  10. CI/CD integration

Practical Example (Workflow)

1) Create feature-branch
2) Commit (small, traceable)
3) Rebase onto main, resolve conflicts
4) Pull Request + Review + CI green
5) Merge
6) Release tag (e.g. v1.4.0) + Release Notes

Advantages and Disadvantages

Advantages

  • Traceability and recovery
  • Parallel development
  • Quality through reviews + CI

Disadvantages

  • Learning curve (conflicts/rebase)
  • Governance effort (policies)

Typical Exam Questions (with Brief Answer)

  1. Merge vs Rebase? Merge preserves branched history, rebase rewrites branch linearly.
  2. What are tags for? Mark releases reproducibly.
  3. Why pull requests? Four-eyes principle + checks.
  4. How do you link code to requirements? Ticket ID in commits/PRs + release notes.

Most Important Sources

  1. https://git-scm.com
  2. https://www.atlassian.com/git
Back to Blog
Share:

Related Posts