Question 1

What is the difference between Git and GitHub?

Accepted Answer

Git is an open-source distributed version control system that runs locally on your machine, tracking changes to your codebase. GitHub is a web-based hosting service for Git repositories, providing a platform for collaboration, code review, and project management on top of Git's core functionalities.

Question 2

How do I choose between merging and rebasing?

Accepted Answer

Merging integrates changes from one branch into another, preserving the divergent commit history with a merge commit. Rebasing re-applies commits from one branch onto another, rewriting commit history to create a linear progression, often preferred for cleaning up feature branches before merging into `main`.

Question 3

What are the common Git workflows?

Accepted Answer

Common Git workflows include Git Flow, which defines strict branching models for features, releases, and hotfixes; GitHub Flow, a simpler, continuous delivery-focused workflow centered around `main` and short-lived topic branches; and Trunk-Based Development, emphasizing frequent, small commits directly to a single `main` branch.

Question 4

Can Git restore lost work?

Accepted Answer

Yes, Git is designed for robust recovery. Commands like `git reflog` allow you to see a history of all changes to your HEAD, enabling you to recover commits that might seem lost, even after force pushes or resets. `git revert` creates a new commit that undoes previous changes, while `git reset` can move your branch pointer to an earlier state.

Learn Git with AI