Master Git Basics and IntelliJ IDEA Integration: A Step‑by‑Step Guide

1. Git Introduction

Git is a popular distributed version control system that maintains two repositories: a local repository and a remote repository, which operate independently unless merge or delete actions are performed. Because most operations run locally, you can commit code and switch branches even without an internet connection. Git uses the SHA‑1 hash algorithm to detect incomplete file transfers or disk corruption.

Basic Git workflow:

git clone – clone the remote master branch to a local repository.

git checkout – switch to a branch for development.

git add – add files to the staging area.

git commit – commit staged changes to the local repository.

git push – push local commits to the remote repository.

Git branching model:

Main branches

master – holds code ready for production deployment.

develop – contains the latest development work; stable changes are merged into master.

Supporting branches

feature – for developing new features, later merged into develop or discarded.

release – for final bug fixes and release preparation.

hotfix – for urgent code fixes.

2. Using Git in IntelliJ IDEA

2.1 Configure Git in IDEA

Install Git locally, configure an SSH key, then go to File → Settings → Version Control → Git (or IntelliJ IDEA → Preferences → Version Control → Git) and set the path to the Git executable. Click “Test” to verify the configuration.

2.2 Clone a Repository

Navigate to VCS → Git → Clone, enter the remote repository URL, and test the connection before cloning.

2.3 Checkout a Branch

Use the branch selector at the bottom right of IDEA to choose and checkout the desired branch. The UI shows both local (1) and remote (2) versions of the branch.

2.4 View Differences (git diff)

In the “Local Changes” view, right‑click a file and select “Show Diff” to see modifications, or choose “Revert” to discard changes.

2.5 View Commit History (git log)

Open the “Log” tab under Version Control to browse the commit history.

2.6 Commit Changes (git commit)

IDEA automatically adds new files to the staging area. Modify a file (e.g., pom.xml), then click the upward‑arrow VCS button, select “Commit”, write a commit message, and commit to the local repository.

2.7 Push to Remote (git push)

Use VCS → Git → Push to send local commits to the remote repository.

2.8 Command‑Line Git in IDEA

Press Alt+F12 to open the embedded terminal. Common commands: git clone <url> – clone a repository. git status – check repository status. git checkout -b <branch> -t origin/<branch> – create and track a new branch. git pull – fetch and merge latest changes. git commit -am "message" – commit all modified files with a message. git merge <branch> – merge another branch into the current one. git push – push commits to the remote.