How to Force Checkout in Git?

Git is used for tracking changes in source code during software development. One of the important operations in Git is checkout, which allows developers to switch between different branches or revert files to a previous state.

Sometimes, you may need to force a checkout, especially when working with conflicting changes or when a clean state is required. This article will guide you through the process of forcing a checkout in Git, explaining the scenarios where it is needed and the steps involved.

What is Git Checkout?

The git checkout command is used to switch between branches, restore files, or create new branches. It is fundamental for navigating the different states of a repository. When you checkout a branch, Git updates the working directory to match the branch's content. This operation is common during development when moving between different features or versions.

When to Use Force Checkout

• You have uncommitted changes that you want to discard.
• You are dealing with merge conflicts and need to favour specific changes.
• You need to reset a branch to a previous state, potentially overwriting existing changes.

Using force checkout ensures that your working directory matches the target state without any remnants of previous work that could cause conflicts or errors.

Approach 1: Using git checkout -f

The -f or --force flag with git checkout is used to discard local changes in your working directory. This is particularly useful when you want to switch branches or revert to a previous commit, and your current changes are not yet committed.

Syntax

git checkout -f <branch-name>

Example: In this example, we force a checkout to the feature-new branch. This means any uncommitted changes in the current branch will be discarded, and the working directory will be updated to match the feature-new branch.

git checkout -f feature-new

Approach 2: Using git checkout --ours or git checkout --theirs

During a merge conflict, you may want to choose between conflicting changes. The --ours and --theirs options help you resolve conflicts by favouring your changes or the changes from the branch you are merging, respectively.

Syntax

git checkout --ours <file-path>
git checkout --theirs <file-path>

Example: In this example, we resolve a conflict by favouring the current branch's version of the app.js file.

git checkout --ours README.md

Similarly, to favour the incoming branch's changes:

git checkout --theirs README.md

Approach 3: Using git checkout -B

The -B flag is used to forcefully create a new branch based on the current HEAD, overwriting any existing branch with the same name. This is useful when you want to reset a branch to a specific state.

Syntax

git checkout -B <branch-name>

Example: In this example, we force the creation of a feature-reset branch from the current HEAD, overwriting any existing branch named feature-reset.

git checkout -B feature-xyz