Git in IntelliJ IDEA
IntelliJ IDEA and its siblings (PyCharm, WebStorm, RubyMine, GoLand, Rider) share one Git integration, so everything here applies to all of them.
JetBrains IDEs take a different approach from VS Code. There is more built in, the merge dialog is the best of any tool in this course, and there are two features Git does not have at all: changelists and Local History. Both are genuinely useful and both cause confusion the first time, so each gets a proper explanation.
Before you start: Section 5 and Section 6. If you also use VS Code, Section 17 sets the two side by side.
Lessons in this section
- Install, Git executable, enable VCS
- Sign in to GitHub and GitLab
- Clone (Get from VCS) and open
- Git, Commit and Log tool windows
- Edit, diff, stage, commit, push, update, fetch
- Branch management
- Resolve conflicts
- Shelve, stash, Local History
- MRs and PRs from IntelliJ
- Terminal and Git settings
- Under the hood: the command behind every action
- Troubleshooting IntelliJ and Git