Git

How to efficiently use Git integration in IntelliJ IDEA

• Set up a Git repository: Clone a repository or put your local project under Git version control
• Manage Git branches: Create, rename, check out, and compare branches

Sync with a remote repository

• Sync with a remote Git repository (fetch, pull, update): Update a branch or a whole project
• Commit and push changes to Git repository: Share the results of your work
• Merge, rebase, or cherry-pick to apply changes: Integrate your changes from one branch into another
• Resolve Git conflicts: Use IntelliJ IDEA tools for resolving conflicts locally

Work with changes

• Add files to Git and track changes: Track changes to a file in the editor
• Undo changes in Git repository: Revert uncommitted or pushed changes
• Group changes into changelists: Manage local changes before committing them to a repository
• Shelve or stash changes: Shelve or stash your pending changes

View and edit history

• Investigate changes in Git repository: Enable annotations and trace back all changes in the log tab
• Edit Git project history: Edit commit messages, amend, squash, and drop commits
• Compare file and folder versions using Diff viewer: Examine the differences between two revisions of a file/folder

Review code

• Review incoming GitHub pull requests: Create, review, comment, and merge pull requests
• Review incoming GitLab merge requests: Create, review, comment, and accept merge requests