Skip to content

Commit d6aee14

Browse files
committed
Improve chapter 09.
1 parent 1b13d8d commit d6aee14

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

09 - Version Control/01 - Enable VCS integration.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ Telling the IDE that the project is under a VCS system.
44

55
1. Explore the VCS menu.
66
We can checkout code from an existing VCS like Git, Mercurial, Subversion, ...
7-
We can import the current project into a VCS system or share it on GitHub
8-
We can enable VCS integration
7+
We can import the current project into a VCS system or share it on GitHub.
8+
We can enable VCS integration.
99

1010
2. Use the VCS | Enable VCS integration menu and specify the project will be in a Git repository.
1111
This will create a .git folder in the project. In the Project Tool Window, notice the color of all files changes.

09 - Version Control/03 - Committing Changes.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ Command+K (Mac OS X)
1818
in the left gutter, denoting a change in the line of code since the last VCS commit.
1919
In the Project Tool Window, the file color also changes to denote the file has been changed.
2020
6. Add a line of text below. Note that the editor now displays green in the left gutter, meaning the line has been added.
21-
7. Commit all changes again and give the commit a descriptive name
21+
7. Commit all changes again and give the commit a descriptive name.

09 - Version Control/05 - Git Mercurial Push.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ Git/Mercurial: Push/Pull
33
Persist local copy of VCS repository to remote copy.
44

55
1. Let's setup a VCS "server" using Git. Using Tools | Open Terminal..., navigate to a temporary folder on your computer.
6-
In that folder, create a new folder (name does not matter, just remember it)
6+
In that folder, create a new folder (name does not matter, just remember it).
77
Open the newly created folder and run: git init
88
This will make the folder a Git repository we can work with in further exercises.
99
2. We want to push our local copy of the VCS to this "server". First, we need to add a "remote".
1010
Using Tools | Open Terminal..., make sure we are in the current project's directory.
1111
Enter the command: git remote add origin <path we created in step 1>
1212
For example: git remote add origin C:\Temp\repository
1313
3. Push changes to the remote repository using the VCS Operations popup. Since we haven't pushed before, the IDE shows that all changesets will be pushed.
14-
4. When working with Git/Mercurial, make sure to push to a different reposiotry from time to time, for example on www.github.com.
14+
4. When working with Git/Mercurial, make sure to push to a different repository from time to time, for example on www.github.com.
1515
This will ensure an off-computer copy of the entire code history.

09 - Version Control/07 - Local History.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
// Code: $name = ucfirst($name);
1515
// Save the file.
1616

17-
// 3. From the VCS Operations popup, Show History (make sure to pick the entry under "Local History")
17+
// 3. From the VCS Operations popup, Show History (make sure to pick the entry under "Local History").
1818
// This opens a new window in which local changes are shown for the current file.
1919
// We can see we have changed a line of code and added a line of code.
2020
// 4. Revert the last change we did from the Local History.

0 commit comments

Comments
 (0)