Skip to content

Commit

Permalink
Merge pull request #2 from rizadh/tut01-add-vim-step
Browse files Browse the repository at this point in the history
Add an instruction to exit Vim's insert mode
  • Loading branch information
ThierrySans authored Sep 15, 2017
2 parents 17bdd4a + 2902ef1 commit 6e98705
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion tutorials/01/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ At this stage both `A` and `B` should have the same version of the code on their

7. `A` pushes the changes to Github first.

8. `B` tries to push the changes to Github but `git` requires to pull an update version from Github first. There will be some conflicts but they should be automatically merged by `git` and you is prompted to enter a merge message. To do so, type `i` (for insert), then type the message and finally `:wq` to save and close the code editor. Commit the changes and push to Github.
8. `B` tries to push the changes to Github but `git` requires to pull an update version from Github first. There will be some conflicts but they should be automatically merged by `git` and you is prompted to enter a merge message. To do so, type `i` (for insert), then type the message, press the `<esc>` key (to exit insert mode) and finally `:wq` to save and close the code editor. Commit the changes and push to Github.

9. `A` pulls the changes from Github.

Expand Down

0 comments on commit 6e98705

Please sign in to comment.