Mastering Git Branch Handling: Strategies for Deletion and Recovery

Introduction¶

Are you looking to master the art of handling Git branches with finesse?

Git branches are pivotal to managing project versions effectively. Understanding how to delete branches locally and remotely, as well as recovering deleted branches, is essential for maintaining a clean and organized repository. This guide serves as your compass, navigating you through the realm of Git branch management and ensuring a smooth and efficient version control process.

Deleting a Branch Locally (CLI)¶

Deleting a branch in Git locally can be done using the git branch -d command:

git branch -d <branch-name>

Deleting a Branch Remotely (CLI)¶

To delete a remote branch from your local repository and push that deletion to the remote repository (e.g., GitHub), use:

git push origin --delete <branch-name>

Deleting a Branch Online (GitHub Interface)¶

Go to the repository on GitHub.
Click on the "Branches" tab.
Locate the branch you want to delete.
Click on the trash can icon or "Delete" button next to the branch name.
Confirm the deletion if prompted.

Fetching and Cleaning Up Deletions¶

After deleting branches remotely, update your local repository to reflect these deletions:

git fetch --prune

This command fetches changes from the remote and prunes (removes) any remote-tracking references that no longer exist on the remote repository.

Recovering Deleted Branches¶

If a branch was mistakenly deleted and not yet pruned, it might be recoverable.

Check the Reflog: Use git reflog show to view recently deleted branches and find the one you want to restore.
Recover the Branch: Identify the commit hash associated with the deleted branch in the reflog and create a new branch at that commit:

git checkout -b <branch-name> <commit-hash>

Replace <branch-name> with the branch name and <commit-hash> with the commit hash from the reflog.

Note: The ability to recover a deleted branch depends on recent activity and whether Git has pruned references.