Set up a Git repository

When you clone an existing Git repository, or put an existing project under Git version control, MPS automatically detects if Git is installed on your computer. If the IDE can't locate a Git executable, it suggests downloading it.

MPS 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, MPS searches for Git in WSL and uses it from there. Also, MPS automatically switches to Git from WSL for projects that are opened when you use the \\wsl$ path.

If for some reason you need to manually configure MPS to use Git from WSL, go to the Version Control | Git page of the Settings/Preferences 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)

MPS 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.

Put an existing project under Git version control

You can create a local Git repository based on an existing project sources.

Associate the entire project with a single Git repository

Open the project that you want to put under Git.
Choose Enable Version Control Integration from the VCS Operations Popup Alt+` or from the main VCS menu.
Choose Git as the version control system and click OK.
After VCS integration is enabled, MPS 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 MPS.

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, MPS suggests adding each newly created file under Git, even if it was added from outside MPS. You can change this behavior in the Version Control | Confirmation page of the Settings/Preferences Ctrl+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 MPS, 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:

.git/info/exclude file.
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 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

A typical .gitignore file that excludes the generated files may look like this:

                workspace.xml
                junitvmwatcher*.properties
                build.properties

                # generated java classes and java source files
                #   manually add any custom artifacts that can't be generated from the models
                #   http://confluence.jetbrains.com/display/MPSD25/HowTo+--+MPS+and+Git
                classes_gen
                source_gen
                source_gen.caches

                # generated test code and test results
                test_gen
                test_gen.caches
                TEST-*.xml
                junit*.properties
            

Check project status

MPS 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 Default 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.

For more info on changelists, see Group changes into different changelists.

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 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.

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 MPS: 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.

Learn more from this video:

Last modified: 20 May 2021