Git in DataSpell

1. Do one of the following:

   • Go to Git | Clone.

   • Right-click the workspace tree or a directory and select Get from Version Control from the context menu

2. Select Git:

   

3. Specify the path to the repository and select the directory to which it will be cloned. Do not select the default DataSpell installation directory as the target local directory. Alternatively, you can select GitHub on the left, login using your credentials, and select any repository you want to work with.

4. Click Clone.

note

Note that you can also enable Git integration for a selected directory: just right-click it and choose Enable VCS Integration from the context menu.

1. Right-click the directory in the Workspace tool window and select Enable VCS integration:

   

2. In the Enable Version Control Integration dialog that opens, select Git.

3. Open the Commit tool window Alt00.

4. Select the files from the directory that should be added to Git, type the commit message, and click Commit and Push:

   

   note

   If you don't want to sync the files with DataSpell settings, like modules.xml and .iml files, with Git, you can ignore them. To do that, right-click the file and choose Git | Add to .gitignore or Git | Add to .git/info/exclude. For more information, refer to Add files to .gitignore or .git/info/exclude.

5. In the dialog window, click Define remote:

   

6. Specify the name of the remote and the URL of the repository:

   

7. Click Push.

   The directory is added to the remote repository. Now you can sync the changes to files in this directory with Git.

1. Go to Git | Clone. If the Git menu is not available, choose VCS | Get from Version Control.

2. In the Get from Version Control dialog, choose GitHub on the left.

3. Log in to GitHub by doing one of the following:

   • If you have a token, click Use token, then paste the token in the Token field, and click Log In.

   • Otherwise, click Log In via GitHub.

     Enter your GitHub credentials in the browser window that opens. If you have two-factor authentication enabled, you will be asked to enter a code that will be sent to you by SMS or through the mobile application.

4. Select a repository from the list of all GitHub projects associated with your account and the organization that your account belongs to.

5. In the Directory field, enter the path to the folder where your local Git repository will be created.

6. Click Clone.

1. Open the directory you want to share.

2. Go to Git | GitHub | Share Project on GitHub.

   If you have already registered your GitHub account in DataSpell, connection will be established using these credentials.

   If you have not registered your account in DataSpell, the Login to GitHub dialog opens. Specify your access token or request a new one with your login and password.

3. When connection to GitHub has been established, the Share Project on GitHub dialog opens. Specify the new repository name, the name of the remote, and enter a description of your project.

   You can select the Private option if you do not want to allow public access to your repository for other GitHub users.

   The name that you specify in the Remote field will be further visible in the Git | Manage Remotes dialog. For more information, refer to Add a remote repository.

4. Click Share to initiate a new repository and upload directory sources to it.

1. Do one of the following:

   • Select Git | GitHub | Open on GitHub from the main menu.

   • Select a file in the editor or in the Project view, and choose Open In | GitHub from the context menu.

     

   • Select the file in the Project view, press CtrlShift0A, and type Open on Github.

2. If you are signed in to GitHub, the remote version of the file will open in the browser.

   Otherwise:

   • Enter your GitHub credentials in the browser window that opens. If you have two-factor authentication enabled, you will be asked to enter a code that will be sent to you by SMS or through the mobile application.

1. Open the Commit tool window Alt00.

2. Locate the required file in a changelist and do one of the following:

   • Right-click the file and select Git | Show Diff.

   • Select the file and press Ctrl0D.

   • Double-click the file.

3. The diff view opens where changes to the file are highlighted.

   The right pane contains the modified version of the file. You can edit it in the diff view.

   The left pane contains the initial version of the file. It is read-only. You can click (Revert) to undo a change.

1. Click Merge in the Conflicts dialog, the Resolve link in the Local Changes view, or select the conflicting file in the editor and choose Git | Resolve Conflicts from the main menu.

2. To automatically merge all non-conflicting changes, click (Apply All Non-Conflicting Changes) on the toolbar. You can also use the (Apply Non-Conflicting Changes from the Left Side) and (Apply Non-Conflicting Changes from the Right Side) to merge non-conflicting changes from the left/right parts of the dialog, respectively.

3. To resolve a conflict, you need to select which action to apply (accept or ignore ) to the left (local) and the right (repository) versions and check the resulting code in the central pane:

   

   You can also right-click a highlighted conflict in the central pane and use the commands from the context menu. The Resolve using Left and Resolve using Right commands provide a shortcut to accepting changes from one side and ignoring them from the other side, respectively:

   

   For simple conflicts (for example, if the beginning and the end of the same line have been modified in different file revisions), the Resolve simple conflicts button that allows merging the changes in one click becomes available.

   

   Such conflicts are not resolved with the Apply All Non-Conflicting Changes action since you must make sure that they are resolved properly.

   note

   Note that the central pane is a fully-functional editor, so you can make changes to the resulting code directly in this dialog.

4. Review merge results in the central pane and click Apply.