Как подключить git к intellij idea
Every time you interact with a remote Git repository (for example, during a pull, update, or push operation), it requires authorization. You can configure IntelliJ IDEA to remember your passwords so that you do not have to specify your credentials each time authorization is required.
Configure a password policy
In the Settings dialog Ctrl+Alt+S , select Appearance and Behavior | System Settings | Passwords on the left.
Select how you want IntelliJ IDEA to process passwords for Git remote repositories:
In native Keychain : select this option to use native Keychain to store your passwords. This setting is only available for MacOS and Linux.
In KeePass : select this option to use the KeePass password manager to store your passwords. When you use the KeePass password manager , a master password will be used to access the file that stores individual passwords. Once IntelliJ IDEA remembers your passwords, it will not ask for them unless you need to access the passwords database. Enter the password that will be used to access the c.kdbx file in the MasterPassword field.
You can change the default location of the c.kdbx file in the Database field.
To import a c.kdbx file, click and select Import from the drop-down menu, or click and specify the path to a local file containing your passwords.
If you want to remove the existing passwords from the database, select Clear .
Do not save, forget passwords after restart : select this option if you want your passwords to be reset after you close IntelliJ IDEA.
Set up a Git repository
When you clone an existing Git repository, or put an existing project under Git version control, IntelliJ IDEA automatically detects if Git is installed on your computer. If the IDE can’t locate a Git executable, it suggests downloading it.
IntelliJ IDEA supports Git from the Windows Subsystem for Linux 2 (WSL2), which is available in Windows 10 version 2004.
If Git is not installed on Windows, IntelliJ IDEA searches for Git in WSL and uses it from there. Also, IntelliJ IDEA automatically switches to Git from WSL for projects that are opened when you use the \\wsl$ path.
If you need to manually configure IntelliJ IDEA to use Git from WSL, go to the Version Control | Git page of the IDE settings Ctrl+Alt+S , click the Browse icon in the Path to Git executable field and select Git from WSL via the \wsl$ path, for example, \\wsl$\debian\usr\bin\git .
Check out a project from a remote host (clone)
IntelliJ IDEA allows you to check out (in Git terms clone ) an existing repository and create a new project based on the data you’ve downloaded.
From the main menu, select Git | Clone , or, if no project is currently opened, click Get from VCS on the Welcome screen.
In the Get from Version Control dialog, specify the URL of the remote repository you want to clone, or select one of the VCS hosting services on the left.
If you are already logged in to the selected hosting service, completion will suggest the list of available repositories that you can clone.
Click Clone . If you want to create a project based on the sources you have cloned, click Yes in the confirmation dialog. Git root mapping will be automatically set to the project root directory.
If your project contains submodules, they will also be cloned and automatically registered as project roots.
When you import or clone a project for the first time, IntelliJ IDEA analyzes it. If the IDE detects more than one configuration (for example, Eclipse and Gradle), it prompts you to select which configuration you want to use.
If the project that you are importing uses a build tool, such as Maven or Gradle, we recommend that you select the build tool configuration.
Select the necessary configuration and click OK .
The IDE pre-configures the project according to your choice. For example, if you select Gradle , IntelliJ IDEA executes its build scripts, loads dependencies, and so on.
Put an existing project under Git version control
You can create a local Git repository based on the existing project sources.
Associate the entire project with a single Git repository
Open the project that you want to put under Git.
Press Alt+` to open the VCS Operations Popup and select Enable Version Control Integration .
Alternatively, from the main menu, select VCS | Enable Version Control Integration .
Choose Git as the version control system and click OK .
After VCS integration is enabled, IntelliJ IDEA will ask you whether you want to share project settings files via VCS. You can choose Always Add to synchronize project settings with other repository users who work with IntelliJ IDEA.
Associate different directories within the project with different Git repositories
Open the project that you want to put under Git.
From the main menu, choose VCS | Create Git Repository .
In the dialog that opens, specify the directory where a new Git repository will be created.
Git does not support external paths, so if you choose a directory that is outside your project root, make sure that the folder where the repository is going to be created also contains the project root.
If you are creating multiple Git repositories inside the project structure, repeat the previous steps for each directory.
After you have initialized a Git repository for your project, you need to add project files to the repository.
Add files to the local repository
In the Commit tool window Alt+0 , expand the Unversioned Files node.
Select the files you want to add to Git or the entire changelist and press Ctrl+Alt+A or choose Add to VCS from the context menu.
You can also add files to your local Git repository from the Project tool window: select the files you want to add, and press Ctrl+Alt+A or choose Git | Add from the context menu.
When Git integration is enabled in your project, IntelliJ IDEA suggests adding each newly created file under Git, even if it was added from outside IntelliJ IDEA. You can change this behavior in the Version Control | Confirmation page of the IDE settings Ctrl+Alt+S . If you want certain files to always remain unversioned, you can ignore them.
If you attempt to add a file that’s on the .gitignore list, IntelliJ IDEA will suggest force adding it. Clicking Cancel in the confirmation dialog only cancels force adding ignored files — all other files will be added to the Git repository.
Exclude files from version control (ignore)
Sometimes you may need to leave certain files unversioned. These can be VCS administration files, artifacts of utilities, backup copies, and so on. You can ignore files through IntelliJ IDEA, and the IDE will not suggest adding them to Git and will highlight them as ignored.
You can only ignore unversioned files, that is files that you see in the Unversioned Files changelist. If a file is added to Git but not committed, you can right-click it in the Local Changes view and choose Rollback .
Git lets you list ignored file patterns in two kinds of configuration files:
Patterns listed in this file only apply to the local copy of the repository.
This file is created automatically when you initialize or check out a Git repository.
One or more .gitignore files in the VCS root directory and its subdirectories.
These files are checked into the repository so that the ignore patterns in them are available to the entire team. Therefore, it is a most common place to store the ignored file patterns.
If there is no .gitignore file in the VCS root directory, you can right-click anywhere in the Project tool window, choose New | File and type .gitignore in the New File dialog.
To create a .gitignore file in Windows Explorer, create a file named .gitignore. and Windows will rename it automatically to .gitignore .
Add files to .gitignore or .git/info/exclude
Decide what kind of Git configuration file you are going to use to ignore files. If in doubt, use .gitignore .
Locate the unversioned file or folder you want to ignore in the Local Changes view or in Project tool window. File colors in these views help you identify the status of the file.
Right click the selection and choose Git | Add to .gitignore or Git | Add to .git/info/exclude .
File colors in these views help you identify the status of the file.
If you need to exclude files by a certain pattern, or files of a certain type, you can edit the .gitignore or .git/info/exclude file directly. See .gitignore patterns format.
If you want ignored files to be also displayed in the Local Changes view, click on the toolbar and select Show Ignored Files .
Check project status
IntelliJ IDEA allows you to check the status of your local working copy compared to the repository version of the project. It uses specific colors to let you see which files have been modified, which new files have been added to the VCS, and which files are not being tracked by Git.
Open the Local Changes view.
The Changes changelist shows all files that have been modified since you last synchronized with the remote repository (highlighted in blue), and all new files that have been added to the VCS but have not been committed yet (highlighted in green).
The Unversioned Files changelist shows all files that have been added to your project, but that are not being tracked by Git.
Track changes to a file in the editor
You can also track changes to a file as you modify it in the editor. All changes are highlighted with change markers that appear in the gutter next to the modified lines, and show the type of changes introduced since you last synchronized with the repository. When you commit changes to the repository, change markers disappear.
The changes you introduce to the text are color-coded:
line added.
line changed.
line deleted.
You can customize the default colors for line statuses on the Editor | Color Scheme | VCS page of the IDE settings Ctrl+Alt+S .
To disable VCS markers in the gutter, deselect the Highlight modified lines in gutter option on the Version Control | Confirmation page of the IDE settings Ctrl+Alt+S .
You can manage changes using a toolbar that appears when you hover the mouse cursor over a change marker and then click it. The toolbar is displayed together with a frame showing the previous contents of the modified line:
You can roll back changes by clicking and explore the differences between the current and the repository version of the current line by clicking .
Instead of reverting the whole file, you can copy any part of the contents of this popup and paste it into the editor.
Add a remote repository
If you created a Git repository based on local sources, you need to add a remote repository to be able to collaborate on your Git project, as well as to eliminate the risks of storing all of your codebase locally. You push changes to a remote repository when you need to share your work and pull data from it to integrate changes made by other contributors into your local repository version.
If you have cloned a remote Git repository, for example from GitHub, the remote is configured automatically and you do not have to specify it when you want to sync with it. The default name Git gives to the remote you’ve cloned from is origin .
For information on how to share project settings for different project formats, see Share project settings through VCS.
Define a remote
Create an empty repository on any Git hosting, such as Bitbucket or GitHub. You can create a repository on GitHub without leaving IntelliJ IDEA: see Share a project on GitHub.
Invoke the Push dialog when you are ready to push your commits by selecting Git | Push from the main menu, or press Ctrl+Shift+K .
If you haven’t added any remotes so far, the Define remote link will appear instead of a remote name. Click it to add a remote.
In the dialog that opens, specify the remote name and the URL where it will be hosted, and click OK .
Add a second remote
In some cases, you also need to add a second remote repository. This may be useful, for example, if you have cloned a repository that you do not have write access to, and you are going to push changes to your own fork of the original project. Another common scenario is that you have cloned your own repository that is somebody else’s project fork, and you need to synchronize with the original project and fetch changes from it.
From the main menu, choose Git | Manage Remotes . The Git Remotes dialog will open.
Click the Add button on the toolbar or press Alt+Insert .
In the dialog that opens, specify the remote name and URL and click OK .
To edit a remote (for example, to change the name of the original project that you have cloned), right-click the remote branch in the Branches pane of the Git Log tool window, and select Edit Remote from the context menu.
You can also edit a remote from the Push Dialog by clicking its name.
To remove a repository that is no longer valid, right-click it in the Branches pane of the Git Log tool window, and select Remove Remote from the context menu.
Name already in use
If nothing happens, download GitHub Desktop and try again.
Launching GitHub Desktop
If nothing happens, download GitHub Desktop and try again.
Launching Xcode
If nothing happens, download Xcode and try again.
Launching Visual Studio Code
Your codespace will open once ready.
There was a problem preparing your codespace, please try again.
Latest commit
Git stats
Files
Failed to load latest commit information.
README.md
Настройка Git и GitHub в Intellij IDEA
1. Добавить аккаунт GitHub в Intellij IDEA
1.1 Создать access token
Перейди в настройки GitHub -> Developer Settings -> Personal access token -> Generate new token
Оставьте только scope’ы: repo, workflow, read:org и gist.
Появится токен. Обязательно скопируйте его, потому что после того, как вы закроете страницу, он пропадёт!
1.2 Добавить аккаунт в Intellij IDEA
Зайдите в Intellij IDEA. Там File->Settings->Version Control->GitHub.
Там уже нажмите Ctrl+N(на Mac Cmd+N)->Login with token. И просто вставьте ваш скопированный токен в поле. Add account. Поздравляю, вы добавили GitHub аккаунт!
2.1 Скачать проект с GitHub
Для того чтобы клонировать проект, достаточно зайти в File->New->Project from Version Control.
Теперь достаточно выбрать проект и нажать Clone.
2.2 Сделать Commit
Достаточно нажать Git->Commit. Откроется вкладка Commit.
В Unversioned Files находятся файлы не добавленные в staging area. Там можно их добавить, чтобы они попали в следующий коммит. В Changes можно убрать файлы, которые не должны попасть в следующий коммит.
Когда файлы выбранный, можно написать сообщение для коммита и сделать его, нажав кнопку Commit.
2.3 Сделать Push
Это можно сделать из той же вкладки, нажав Commit and Push, после чего файлы загрузятся на удалённый репозиторий.
Так же это можно сделать перейдя Git->Push
В открывшемся окне можно выбрать необходимые коммиты и запушить их на удалённый репозиторий.
2.4 Загрузить через Fetch
Fetch безопасен всегда, поэтому его можно использовать когда угодно. Он просто загружает все изменения с удалённого репозитория, не делая merge с локальным репозиторием. Т.е. загруженные изменения не применятся, а останутся в отдельных ветках, расходящихся с вашими на последнем запушеном коммите.
Подходить, если вам нужно сделать Merge с изменениями из-вне вручную.
2.5 Загрузить через Pull
Pull работает только, если можно сделать fast-forward merge для веток с одинаковыми названиями в удалённом репозитории и в локальном.
В окне можно выбрать ветку, которую надо обновить из удалённого репозитория. Если удалённых репозиториев несколько, то их тоже можно выбрать.
Так же там можно добавить специальные опции, но они требуют отдельного объяснения.
Getting Started with GitHub and IntelliJ
This document explains about using GitHub with IntelliJ to clone Git projects and Rise PR using IntelliJ IDEA.
Version Control:
Version Control refers to a system that records changes to a file or set of files over time, called the ‘versions’. In other words, these versions help you in tracking the changes in your codes/project and if necessary, undo those changes as well. There are three types of version control:
GIT and GitHub:
Git is a distributed version control software which you need to install on your local system in order to use it. For an individual working on a project alone, Git proves to be excellent software.
Git File Workflow:
Workspace Copy:
Users’ active directory simply creates new files in this space, and this will be tracked by the Git.
Stage Area:
It is a place where all the modified files marked to be committed are placed.
Local Repository: User’s copy of the version database or file and access all the files through local repos and push the change made to remote
Remote Repository: It is a server where all the collaborators upload changes made to files.
Clone Command: Creates a copy of an existing remote repository inside the local repository.
Importing Project from GitHub: (Install Git Plugin in IntelliJ)
Step 1: Open IntelliJ IDEA, Head on to Get from Version Control
Step 2: Open GitHub, navigate to project which you want to clone. Create your fork and Copy Fork Link not the Main Master Link
Step 3: Paste link in URL filed and Select the directory you want to store project in local. Click on Clone
Git in IntelliJ:
You will be directed to Workspace.
Git Branches: You can find your Local and remote branches here.
Create New Branch in IntelliJ: Click on +New Branch to create a new local Branch, name your branch and click on CREATE
Now, Local Branch is created, and you will be Checked out to Newly Created Local Branch
View Local and Global Changes in IntelliJ:
After making Code development / required modifications, you can view local changes in Version Control → Local Changes Tab
All Global/Remote Changes are displayed in Version Control à Log Tab
Commit Changes and Rise Pull Changes:
Step 1: Go to VCS →Git → Commit File
Compare Changes with original file, you have two options,
1. Commit — Commit changes from current branch
2. Commit and Push — Push changes to Remote
Step 2: If you have Selected Commit and Push Option, you will get Window to push Changes
Done! Once you open GitHub, you will get option to rise Pull Request.
Update your Fork with Master Fork:
Step 1: Go to Terminal, run
Step 2: Now go to Master Repository, and Copy Link
Step 3: Now, run
Available remote is listed by git running
Step 4: The first thing is to fetch all the changes from the original repository. Note that commits to the original repository will be stored in a local branch called, upstream/master.
Step 5: Make sure that you are on your fork’s master branch.
Step 6: Merge the changes from the upstream/master into your local master branch. This will bring your fork’s master branch into sync with the upstream repository without losing your local changes. If you have made any changes that create a conflict, you will obviously have to resolve those before you can complete the merge.
Step 7: At this point your local branch is synced to the original repositories master branch. If you want to update the GitHub repository, you need to push your changes.