Tutorial: Getting started with Git in CLion

Create a new project

1. Launch CLion and click New Project on the Welcome screen.

2. In the dialog that opens, select the project type (for example, C++ Executable), provide the location path and set the language standard. Click Create.

   

3. The new project will immediately open in CLion:

   

1. From the main menu, select | Enable Version Control Integration.

2. In the dialog that opens, select Git from the list of available version control systems and click OK.

   

Alternatively, press Alt+` and select Create Git Repository (or press 1). In the Finder window that opens, specify a root folder for the local Git repository.

1. Group the files by directories: press Ctrl+Alt+P or click on the toolbar and select Directory.

   

2. Select the directories that you don't want to share. For example, the following directories may be ignored without breaking the integrity of the project:

   • .idea: settings of your local CLion installation. Ignore this directory unless you want to share your settings among the team members.

   • cmake-build-debug: the automatically created directory for CMake build artifacts.

3. Right-click the selection and choose Add to .gitignore | Add to .gitignore.

   

4. You will be prompted to confirm the creation of a new .gitignore file in the root directory of your project. Click Create.

5. From the dialog that opens, you can either add the newly created file to Git right away by pressing Add or postpone this by pressing Cancel.

   Click Add. You will see that the .gitignore file has been added to the root directory of your project and placed to Changes area. The directories you selected to ignore are no longer displayed in the Unversioned Files list:

   

   Any time, you can edit the .gitignore file to add new directories to the list or remove existing ones.

1. In the Commit tool window Alt+0, move all the files from the Unversioned Files list to Changes using drag-and-drop. Select all the files by clicking the root folder checkbox.

2. Type a message for your first commit:

   

3. Click Commit. The corresponding notification appears once the commit is performed:

   

1. From the main menu, select VCS | Import into Version Control | Share Project on GitHub.

2. In the dialog that opens, enter your GitHub login and password and click Log In:

   

   If you are not registered on GitHub, click Sign up for GitHub to go to github.com and create a new account there.

3. If you have two-factor authentication enabled for GitHub, the following dialog will appear:

   

   Enter the code and click OK.

4. In the dialog that opens, you can change the repository name (by default, it is the same as the project name), the name of a remote (by default, origin), choose the repository type (public or private), and add some description if needed:

   

   Click Share. After the project is successfully published on GitHub, the following notification will appear:

   

   Click the link in the notification to open the repository on GitHub.

1. Press Ctrl+T to pull the latest version of the current branch.

2. On the status bar, you can see your current branch — master. Click it to open the Git Branches menu:

   

3. From the Git Branches menu, select New Branch.

4. In the dialog that opens, specify the branch name, for example, new_feature, and select the Checkout branch checkbox to switch to the new branch right away.

   

   Now you are switched to the newly created branch:

   

5. Add the corresponding branch to the remote repository. To do this, select the local branch in the Git Branches menu and click Push:

   

   In the dialog that opens, click Push. The new branch will be added to the remote repository and will appear in the Remote Branches list in the Git Branches menu:

   

1. Press Ctrl+T to pull the latest version of the current branch.

2. Add a new file to the project, for example, subfunc.cpp, and modify the main.cpp file.

   In the Project tool window and in the editor tabs, CLion applies different colors to files: blue to modified, green — to newly added. Moreover, in the gutter area of a modified file, the colored change markers appear next to the modified lines. You can click the gutter marker to view details:

   

3. Click to view the difference in a separate window:

   

4. Go to the Commit tool window Alt+0, to preview all the changes at once. Double-click a file to open the difference view in the editor:

   

   See more in Review changes.

1. Press Ctrl+T to pull the latest version of the current branch.

2. In the Commit tool window Alt+0, review the changes, make sure that the new file that you're adding to Git is selected, type the commit message, and click Commit.

3. Press Ctrl+Shift+K or select Git | Push from the main menu to push the changes to the remote repository. The Push Commits dialog opens. Here you can see all the commits to be pushed as well as all the affected files. Before pushing the changes, you can see the differences for each file. To do this, right-click a file and select Show Diff or press Ctrl+D:

   

4. Click Push.

Merge branches

1. Select the master branch in the Git Branches menu on the status bar and click Checkout.

2. Make some changes in main.cpp that has been modified before in the new_feature branch, for example:

   

   This way, we simulate a conflict situation. Push and commit the change as described above.

3. From the Git Branches menu, select new_feature and click Merge into Current.

Resolve conflicts

1. In the Conflicts dialog, you have several options to resolve the conflict:

   • Accept Yours: keep the changes made in the current branch.

   • Accept Theirs: apply the changes from the branch that you want to merge into the current one.

   • Merge: resolve conflicts manually in a dedicated dialog.

   Click Merge. The Merge Revisions dialog opens:

   

2. In this dialog, you can accept changes by clicking /, decline them by clicking , and type code in the Result pane. See more in Resolve Git conflicts.

   The syntax errors are highlighted in the Merge Revisions window:

   

   Resolve the conflict as on the screenshot above and click Apply.

3. Push the changes to the remote repository by pressing Ctrl+Shift+K or selecting Git | Push from the main menu.

• Right-click the file in the editor or in the Project tool window Alt+1 and select Git | Show History. The History tab of the Git tool window opens:

  

  On this tab you can view all commits that affected the file and find out in which commit the change of your interest was added.

• In the editor, select a code fragment you want to view history for, right-click the selection, and choose Git | Show History for Selection. The History for Selection window will open:

  

  Here you can review all the commits that affected the code selection of your interest.

1. In the master branch, make a change that you are going to cherry-pick. Commit Ctrl+K and push Ctrl+Shift+K this change.

2. Switch to the new_feature branch.

3. In the Git tool window Alt+9, open the Log tab.

4. In the Branch list, select master.

5. Select your last commit and click :

   

6. Resolve the conflict by pressing Accept Theirs form the dialog that opens. This means we override the code in the main.cpp file by the changes from the cherry-picked commit.

7. Commit the changes from the Commit Changes dialog that opens and push them Ctrl+Shift+K.