Question 1

How do I delete a branch in Git?

Accepted Answer

In a typical Git repository you may have a couple of permanent branches, such as `master` and `development` that are constantly worked on, but also a number of branches that are temporary, for things like bug fixes, new features, or versions of your project. Lots of developers choose to delete th...

Question 2

How can I remove a large file from my commit history?

Accepted Answer

If you've committed a large file to your repository that takes up a significant amount of disk space, simply removing it in a later commit won't actually help. Git stores the full history of every file, so even after you delete a file from your working directory, it remains in Git's history in ca...

Question 3

How do I manage files that are in the path of a previous Git submodule?

Accepted Answer

If you previously used a Git submodule to pull in third-party code and now want to manage that directory as a regular part of your repository, you need to fully remove the submodule first. Simply deleting the folder or running `git add` on it will not work because Git still has submodule metadata...

Question 4

How to resolve merge conflicts

Accepted Answer

Merge conflicts happen when Git cannot automatically combine changes from two branches. This typically occurs when two developers edit the same lines in a file, or when one branch deletes a file that another branch modifies. Rather than guessing which version is correct, Git pauses the merge and ...

Question 5

How to move a subdirectory into a separate Git repository

Accepted Answer

It may be useful to detatch or move a subdirectory in your repository, out to an external repository, especially if you want to re-use the contents of said subdirectories across multiple repositories. You might also consider using [Git submodules](/git/commands/git-submodule) for this purpose. Yo...

Question 6

How do I authenticate with GitHub when pushing commits?

Accepted Answer

Since August 2021, GitHub no longer accepts passwords for Git operations over HTTPS. If you try to push using a password, you'll get an `Authentication failed` error. Here are the modern ways to authenticate with GitHub. ## Using SSH keys (recommended) SSH key authentication is the most common ap...

Question 7

How can I change the author of multiple Git commits?

Accepted Answer

There are several reasons you might need to change the author on past commits: you switched email addresses, your Git config had the wrong name, or you committed from a shared machine that wasn't configured with your details. Whatever the reason, Git gives you a few ways to fix it. **A word of ca...

Question 8

How do I rename a branch in Git?

Accepted Answer

Renaming a branch in Git is a two-part operation: updating the name locally and then reflecting that change on the remote. Neither step touches your commit history — you are only changing a label. ## Rename the current branch If you are already on the branch you want to rename, use the `-m` flag ...

Question 9

How do I squash multiple commits into one?

Accepted Answer

Squashing combines multiple commits into a single one. This is useful for cleaning up a feature branch before merging — turning a series of "WIP" or "fix typo" commits into one coherent commit with a meaningful message. ## Start an interactive rebase To squash the last 3 commits, use [`git rebase...

Question 10

What is the difference between git reset and git revert?

Accepted Answer

Both [`git reset`](/git/commands/git-reset) and `git revert` let you undo changes, but they work in fundamentally different ways. Choosing the wrong one on a shared branch can cause problems for everyone on your team. ## git reset — rewrite history `git reset` moves the branch pointer backwards, ...

Question 11

How do I recover a deleted branch in Git?

Accepted Answer

Deleting a branch in Git does not immediately destroy the commits — it just removes the label pointing to them. As long as those commits are still in Git's reflog, you can get the branch back. If you are looking for how to delete a branch intentionally, see [how to delete a branch in Git](/git/fa...

Question 12

How are "git fetch" and "git pull" different?

Accepted Answer

When you need to get changes that other team members have pushed to the remote repository, you have two commands to choose from: [`git fetch`](/git/commands/git-fetch) and [`git pull`](/git/commands/git-pull). They both download data from the remote, but they differ in what happens next. ## Quick...

Question 13

How do I clone a specific branch in Git?

Accepted Answer

By default, [`git clone`](/git/cloning-an-existing-repository) checks out the repository's default branch (usually `main` or `master`). If you need a different branch checked out from the start, you can specify it directly. For a general introduction to cloning, see our tutorial on [cloning an ex...

Question 14

How do I use AI to write better git commit messages?

Accepted Answer

## What makes a good commit message A useful commit message answers *why* a change was made, not just what changed. The diff already shows what changed — the message should add context a reviewer cannot infer from the code alone. The standard conventions: - **Imperative mood**: "Add retry logic" ...

Question 15

How do I review AI-generated code before committing?

Accepted Answer

## Why AI-generated code needs a dedicated review step Code produced by Copilot, Cursor, Claude, or any other AI tool can contain: - **Hallucinated APIs** — method names or parameters that look plausible but do not exist in the library version you are using - **Missing error handling** — happy-pa...

Question 16

How do I resolve merge conflicts with AI assistance?

Accepted Answer

## Why AI needs more than the conflict markers When you open a file with a merge conflict, you see markers like this: ``` <<<<<<< HEAD const timeout = 5000; ======= const timeout = retryConfig.timeoutMs ?? 3000; >>>>>>> feature/retry-logic ``` This tells ...

Question 17

How do I generate a changelog from my git history using AI?

Accepted Answer

## The two-step process 1. Extract a clean, structured log from git 2. Pass it to an AI with a prompt that specifies the output format you want ## Step 1: Get the right git log output ```bash # All commits since the v1.0.0 tag, excluding merge commits git log v1.0.0..HEAD --oneline --no-merges # ...

Question 18

How do I add AI-powered checks to my git pre-commit hooks?

Accepted Answer

## What git hooks are Git hooks are shell scripts that git runs automatically at specific points in the workflow. The `pre-commit` hook runs before git records a commit — if the script exits with a non-zero status, the commit is blocked. ## The pre-commit framework Managing raw shell scripts in `...

Question 19

How can I clean up deleted branches?

Accepted Answer

After working on a project for a while, you will accumulate local branches that track remote branches which have already been deleted. Feature branches get merged, teammates clean up after themselves on the remote, but your local repository still holds references to all of them. Here is how to ti...

Question 20

What is a "detached HEAD" in a Git repository?

Accepted Answer

In Git, **HEAD** is a pointer that tells you which commit your working directory is currently based on. Normally, HEAD points to a branch name (like `main`), and that branch points to the latest commit. When you make new commits, the branch moves forward and HEAD follows along. A **detached HEAD*...

Question 21

How do I undo my last commit?

Accepted Answer

Made a commit too early, included the wrong files, or just wrote a terrible commit message? It happens constantly. Git gives you several ways to undo your last commit, and the right choice depends on what you want to keep. ## Keep your changes staged (soft reset) If the code itself is fine but yo...

Question 22

How can I edit my last commit message?

Accepted Answer

You may find you've just created a new commit, but you want to modify the message. Simply navigate to your project's directory via the command prompt, and use the [`git commit`](/git/committing-file-changes) amend flag: ```bash $ git commit --amend ``` You'll be redirected to your text editor to ...

Question 23

How can I revert a Git repository to a previous commit?

Accepted Answer

You may find you're in a situation where you need to revert the repository to a previous commit. This can be done using the following command: ```bash $ git revert 8fd3350cf6 ``` Where `8fd3350cf6` is the old commit you're reverting _back to_. You'll be prompted to review and add a commit message...

Question 24

How do I undo the most recent local commits in Git?

Accepted Answer

Sometimes you need to roll back more than just the last commit. Maybe a series of changes introduced a bug, or you want to squash several work-in-progress commits before pushing. Git's `reset` command handles this by moving HEAD back by however many commits you specify. ## Soft reset (keep change...

Question 25

How can I make Git “forget” about a file that was tracked but is now in .gitignore?

Accepted Answer

Adding a file to `.gitignore` tells Git to ignore **untracked** files matching that pattern. But if the file was already committed, `.gitignore` has no effect on it. Git will keep tracking changes to that file until you explicitly remove it from the index. ## Remove a single file from tracking Us...

Git FAQs