Git

Git

Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency.

Magic Wand

tip

Magic Wand
Use the Magic Wand to Resolve Simple Conflicts
VCS Popup

tip

VCS Popup
Open VCS actions using the keyboard
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
Git

tip

Git
Git tool window
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
Getting the project

Part of tutorial

Getting the project
Forking and cloning the project
Creating the pull request

Part of tutorial

Creating the pull request
How to create a pull request on GitHub
Negotiating the review process

Part of tutorial

Negotiating the review process
Review and hopefully get your pull request merged
Summary and Shortcuts

Part of tutorial

Summary and Shortcuts
Contributing to open source software Summary
Introduction

Part of tutorial

Introduction
Contributing to open source software
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.
Cherry Pick a Commit to a Different Branch

tip

Cherry Pick a Commit to a Different Branch
Oops, you committed your code to the wrong branch… You could redo the work, but you don't want to!.
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.
Browse Branch's Commits

tip

Browse Branch's Commits
Review the changes in main before bringing them to your branch.
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.
Edit Commit Message

tip

Edit Commit Message
Edit the wording in your last commit message, after you committed.
Git interactive rebase

tutorial

Git interactive rebase
How to clean up your Git commit history with Git interactive rebase
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
Monitor Incoming and Outgoing Commits

tip

Monitor Incoming and Outgoing Commits
Want to know if your branch has new commits? Here's how.