Version Control with Git & Collaboration: Branches, Pull Requests, Workflows & Best Practices Guide

1. What is version control?

Q: What is version control?

Version control is the practice of tracking and managing changes to files or code over time. It allows multiple developers to work on the same project without overwriting each other’s work, keeps a history of changes, and makes it easy to roll back to previous versions when necessary.

2. What is the difference between centralized and distributed version control systems?

Q: What is the difference between centralized and distributed version control systems?

Centralized Version Control (CVCS): A single central server stores all versions of the code (e.g., Subversion). Developers need constant access to the server.

Distributed Version Control (DVCS): Every developer has a full copy of the repository (e.g., Git). Developers can work offline and sync changes when connected.

Git is the most popular DVCS today.

3. Why is version control important in software development?

Q: Why is version control important in software development?

Version control provides:

• A history of changes for accountability and learning.
• The ability to roll back to stable versions.
• Easier collaboration among teams.
• Reduced risk of code conflicts.
• Better project organization and release management.

4. What is Git and why is it widely used?

Q: What is Git and why is it widely used?

Git is a distributed version control system that allows multiple developers to track changes in their code, work independently, and merge updates efficiently. It is popular because of its speed, flexibility, branching system, and wide adoption in platforms like GitHub, GitLab, and Bitbucket.

5. What is a repository in Git?

Q: What is a repository in Git?

A repository (repo) is a storage location that contains a project’s files and the entire history of changes. It can be:

• Local repository: Stored on a developer’s computer.
• Remote repository: Stored on a server (e.g., GitHub).

6. What is the difference between Git and GitHub?

Q: What is the difference between Git and GitHub?

Git: A tool/software installed locally for version control.

GitHub: A cloud-based hosting platform that allows teams to store Git repositories online, collaborate, and manage projects.

7. Explain Git’s staging area (Index).

Q: Explain Git’s staging area (Index).

The staging area is an intermediate place where changes are collected before being committed to the repository. It allows developers to carefully choose which modifications to include in a commit.

8. What is a Git commit?

Q: What is a Git commit?

A commit is a snapshot of project changes recorded in the repository. Each commit has a unique identifier (hash) and includes metadata such as author, timestamp, and commit message. Commits represent the project’s timeline.

9. What is a Git branch and why is it useful?

Q: What is a Git branch and why is it useful?

A branch is a pointer to a specific commit that allows developers to work on features or bug fixes independently. Branching enables experimentation without affecting the main codebase and simplifies collaboration.

10. What is the difference between merging and rebasing in Git?

Q: What is the difference between merging and rebasing in Git?

Merging combines changes from one branch into another, creating a new merge commit.

Rebasing re-applies commits from one branch onto another, creating a cleaner, linear history.

Use merging for collaboration, rebasing for maintaining clean history.

11. How do developers collaborate using Git and platforms like GitHub?

Q: How do developers collaborate using Git and platforms like GitHub?

Developers collaborate by:

• Cloning a remote repository.
• Creating a branch for their work.
• Making changes and committing locally.
• Pushing the branch to the remote repository.
• Submitting a Pull Request (PR) or Merge Request (MR).
• Reviewing and merging changes into the main branch.

12. What is a Pull Request (PR) or Merge Request (MR)?

Q: What is a Pull Request (PR) or Merge Request (MR)?

A Pull Request (GitHub) or Merge Request (GitLab) is a proposal to merge changes from one branch into another. It allows other developers to review, comment, and suggest improvements before the changes are merged.

13. How are conflicts resolved in Git collaboration?

Q: How are conflicts resolved in Git collaboration?

A merge conflict occurs when two developers modify the same part of a file. To resolve conflicts:

• Git highlights conflicting sections.
• The developer manually edits and chooses the correct version.
• The resolved file is staged and committed.

14. What is Git workflow in team collaboration?

Q: What is Git workflow in team collaboration?

Common workflows include:

• Feature Branch Workflow: Each new feature is developed in its own branch.
• Gitflow Workflow: Structured approach with master, develop, feature, release, and hotfix branches.
• Forking Workflow: Developers fork the repository, make changes, and submit PRs.

15. What is Continuous Integration (CI) in version control?

Q: What is Continuous Integration (CI) in version control?

Continuous Integration is a practice where code changes are automatically tested and built whenever they are pushed to a repository. It helps detect errors early, ensures code quality, and supports collaboration in larger teams.

16. What is the difference between git pull and git fetch?

Q: What is the difference between git pull and git fetch?

git fetch: Downloads changes from a remote repository but does not merge them automatically.

git pull: Fetches and immediately merges changes into the current branch.

17. What is git clone and how is it different from git init?

Q: What is git clone and how is it different from git init?

git clone: Copies an existing remote repository (including history) to the local machine.

git init: Initializes a new, empty Git repository in a directory.

18. How does Git ensure integrity of data?

Q: How does Git ensure integrity of data?

Git uses SHA-1 cryptographic hashes for each commit and file. This ensures that every version is uniquely identified and tamper-proof.

19. What is the difference between forking and branching?

Q: What is the difference between forking and branching?

Branching: Creating a new line of development within the same repository.

Forking: Creating a copy of someone else’s repository into your account to propose changes independently.

20. What are best practices for version control and collaboration?

Q: What are best practices for version control and collaboration?

• Use meaningful commit messages.
• Commit frequently with small, logical changes.
• Always work on feature branches, not directly on main/master.
• Keep branches up to date with the main branch.
• Use Pull Requests for collaboration and code reviews.
• Resolve conflicts carefully and test after merging.
• Use .gitignore to exclude unnecessary files.
• Follow a consistent branching strategy (e.g., Gitflow).