Set up a Git repository
When you clone an existing Git repository or put an existing project under Git version control, Aqua automatically detects if Git is installed on your computer. If the IDE can't locate a Git executable, it suggests downloading it.
Aqua 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, Aqua searches for Git in WSL and uses it from there. Also, Aqua automatically switches to Git from WSL for projects that are opened when you use the \\wsl$ path.
If you need to manually configure Aqua to use Git from WSL, go to the Version Control | Git page of the IDE settings Control+Alt+S, click the Browse icon in the Path to Git executable field, and select Git from WSL via the
\wsl$ path, for example,
Check out a project from a remote host (git clone)
Aqua allows you to check out (in Git terms, clone) an existing repository and create a new project based on the data you've downloaded.
To start cloning a Git repository, do one of the following:
If the version control integration is already enabled, go to.
If the version control integration is not enabled yet, go to.
Alternatively, go to.
If no project is currently open, 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.
In the Trust and Open Project '<project_name>'? project security dialog, select the way you want to open the project: Trust Project or Preview in Safe Mode.
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, go to.
Choose Git as the version control system and click OK.
The entire project will then be associated with a single Git directory, so there is no need to add each file to the Git directory individually.
After VCS integration is enabled, Aqua 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 Aqua.
Associate different directories within the project with different Git repositories
Open the project that you want to put under Git.
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 Command 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 Command Alt A or choose Git | Add from the context menu.
When Git integration is enabled in your project, Aqua suggests adding each newly created file under Git, even if it was added from outside Aqua. You can change this behavior in the Version Control | Confirmation page of the IDE settings Control+Alt+S. If you want certain files to always remain unversioned, you can ignore them.
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 Aqua, 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 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 the 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 , and type .gitignore in the New File dialog.
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 Changes view or in the 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 type, you can edit the
.git/info/exclude file directly. See .gitignore patterns format.
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 your whole 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 more information about sharing project settings for different project formats, refer to Share project settings through VCS.
Define a remote
Invoke the Push dialog when you are ready to push your commits by selecting from the main menu, or press Command Shift K.
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 are going to push changes to your own fork of the original project. Another common scenario is that you have cloned your own repository, which is somebody else's project fork, and you need to synchronize with the original project and fetch changes from it.
Go to Git Remotes dialog will open.. The
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.
Learn more from this video: