Version Control

Version Control

Integrated, visual version control across your project.

Working with version control systems (VCS) such as Git, Mercurial, and others is an integral part of development. Our IDEs put a common abstraction atop each system, then puts a visual face on all your VCS activities.

See Also

Version control

Commit Changes

tip

Commit your changes to VCS

Magic Wand

tip

Use the Magic Wand to Resolve Simple Conflicts

VCS Popup

tip

Open VCS actions using the keyboard

Version control (Git) history

Part of tutorial

Version control (Git) history

Using Version control (Git) history to understand the project

Interactive rebase

tip

Interactive rebase

Using interactive rebase in IntelliJ IDEA

Selectively commit changes

tip

Selectively commit changes

Selectively Commit Changes to a File

Annotate with Git Blame: Commit

tip

Annotate with Git Blame: Commit

Look at the commit a change was part of from Annotate with Git Blame

Annotate with Git Blame: Show Diff

tip

Annotate with Git Blame: Show Diff

Look at the diff a change was part of from Annotate with Git Blame

Local History

tip

Search text in Local History

Introduction

Part of tutorial

Importing a project into IntelliJ IDEA

Project from version control

Part of tutorial

Project from version control

Cloning a project from version control

Summary and Shortcuts

Part of tutorial

Summary and Shortcuts

Importing projects into IntelliJ IDEA Summary

GitLab Merge Requests

tutorial

GitLab Merge Requests

Working with GitLab Merge Requests

Contributing to open source software; creating a pull request

tutorial

Contributing to open source software; creating a pull request

Contribute code to someone else's GitHub project with a pull request

Making changes to code

Part of tutorial

Making changes to code

Making and committing our changes

Creating the pull request

Part of tutorial

Creating the pull request

How to create a pull request on GitHub

Getting the project

Part of tutorial

Getting the project

Forking and cloning the project

Introduction

Part of tutorial

Contributing to open source software

Summary and Shortcuts

Part of tutorial

Summary and Shortcuts

Contributing to open source software Summary

Negotiating the review process

Part of tutorial

Negotiating the review process

Review and hopefully get your pull request merged

Resolve Conflicts

tip

Resolve Conflicts

Let the IDE help in the tricky business of resolving merge conflicts.

Move Work Aside With Stash

tip

Move Work Aside With Stash

Use git's stash to move uncommitted work aside temporarily.

Move Work Aside With Shelve

tip

Move Work Aside With Shelve

Move uncommitted work aside when you need to work on another branch.

Rebase Feature Branch

tip

Rebase Feature Branch

Get your feature branch caught up with changes on the main branch.

Autocomplete File Names in Commits

tip

Autocomplete File Names in Commits

How to reference filenames in a commit in WebStorm.

Compare With Branch

tip

Compare With Branch

See the changes in another branch's commits.

See Unsynced Commits

tip

See Unsynced Commits

See what's happening on that other branch.

Clone project from GitHub

tip

Clone project from GitHub

Clone a project from the IntelliJ IDEA welcome screen

Browse Branch's Commits

tip

Browse Branch's Commits

Review the changes in main before bringing them to your branch.

See VCS Changed Lines In Gutter

tip

See VCS Changed Lines In Gutter

Quickly spot which parts of your file have changed since the last commit.

Only Commit Some Changes

tip

Only Commit Some Changes

Unselect files or changed regions within files during the commit process.

Fix Your Work with Amend Commit

tip

Fix Your Work with Amend Commit

Put some missing work back into your last commit, before you push.

Marco Codes - Git

tutorial

Marco Codes - Git

5 Git Tricks you need to know

Use Local History to Avoid Disaster

tip

Use Local History to Avoid Disaster

Use the IDE's built-in history facility to recover changes when VCS can't help you.

Undo Last Commit

tip

Undo Last Commit

Undo a commit... without misery.

Undo Last Commit

tip

Undo Last Commit

Undo a commit...without misery.

Undo Last Commit

tip

Undo Last Commit

Undo a commit...without misery.

Undo Last Commit

tip

Undo Last Commit

Undo a commit...without misery.

Edit Commit Message

tip

Edit Commit Message

Edit the wording in your last commit message, after you committed.

Undo Last Commit

tip

Undo Last Commit

Undo a commit...without misery.

Git interactive rebase

tutorial

Git interactive rebase

How to clean up your Git commit history with Git interactive rebase

Navigating a Long Class

tip

Navigating a Long Class

There are various tips and tricks you can use to navigate a long class in IntelliJ IDEA

Manage VCS Changelists in IntelliJ IDEA

tip

Manage VCS Changelists in IntelliJ IDEA

Group and commit changes related to certain tasks

Creating a Project from GitHub

tutorial

Creating a Project from GitHub

How you can create an IntelliJ IDEA project from your code in GitHub

Sharing your Project on GitHub

tutorial

Sharing your Project on GitHub

How you can share a local project to GitHub

Resolve Merge Conflicts in VCS

tip

Resolve Merge Conflicts in VCS

Use VCS options in IntelliJ IDEA to resolve merge conflicts visually in the editor

Search text in Local History

tip

Search text in Local History

Find exactly what you are looking for, even if you removed it

Cleanup code before commit

tip

Cleanup code before commit

Remove all the redundant parenthesis and other unneeded code before commit

Run tests before commit

tip

Run tests before commit

Make sure your tests pass before reaching the CI/CD pipeline

Run inspections before commit

tip

Run inspections before commit

Catch all issues before your code reaches the upstream

Sign Git commits with GPG keys

tip

Sign Git commits with GPG keys

Improve the security of your commits by using GPG keys

Monitor Incoming and Outgoing Commits

tip

Monitor Incoming and Outgoing Commits

Want to know if your branch has new commits? Here's how.

tip

Use a lightweight inspection profile on commit

Fully customise the checks you must perform before you commit your changes to version control

Enable Git Staging

tip

Enable Git Staging

Git Staging is an alternative approach to IntelliJ IDEA Changelists

Create a Project from GitHub

tip

Create a Project from GitHub

Let GoLand do the work to clone and set up a project hosted on GitHub.

Put New Project Under Version Control

tip

Put New Project Under Version Control

The fastest way to register a new project directory under local version control.

Version Control in Rider

Part of tutorial

Version Control in Rider

Working with Git, commit code, rebase and switch branches. Let's explore version control (VCS)!

VCS Operations Quicklist

tip

VCS Operations Quicklist

Your next VCS action at hand!

Create a Project from GitHub

tip

Create a Project from GitHub

Let PyCharm do the work to clone and setup a project hosted on GitHub.

Put New Project Under Version Control

tip

Put New Project Under Version Control

The fastest way to register a new project directory under local version control.