Git and GitHub interview questions

Git is the version control tool. GitHub is a hosting platform for Git repositories with pull requests, issues and Actions.

The working directory, the staging area (index) and the repository (commits).

fetch downloads changes without merging. pull is fetch plus merge (or rebase).

Merge joins branches with a merge commit and keeps history as it happened. Rebase replays commits on a new base for a linear history. Do not rebase shared branches.

Open the conflicted files, choose the correct content, remove the markers, then git add and commit.

reset moves the branch pointer and can rewrite history. revert creates a new commit that undoes a previous one, safe for shared branches.

A request to merge a branch, where teammates review code, run checks and discuss before merging.

A file listing paths Git should not track, like secrets, virtual environments and build outputs.

Saves uncommitted changes temporarily so you can switch branches, and restores them later with git stash pop.

Your own copy of someone else's repository on GitHub, used to propose changes via pull requests.

Applying a specific commit from one branch onto another.

A pointer to the current commit or branch you are on.

Use a soft reset.

git reset --soft HEAD~1

When you check out a commit instead of a branch. New commits there are easy to lose unless you create a branch.

GitHub rules on a branch like main: required reviews, passing checks and no force pushes.

GitHub's CI/CD: workflows in YAML that run on events like push or pull request, for tests, linting and deployments.

A short imperative summary like 'Add incremental load for orders', with details in the body if needed.

Usually GitHub flow: short-lived feature branches from main, pull requests, review and merge.

Passwords, keys, tokens and large data files. Use environment variables, secret stores and .gitignore.

Databricks Git folders, ADF and Fabric Git integration, and SQL and dbt projects in repositories with CI checks.