diff --git a/assets/git_pycharm_source_02.png b/assets/git_pycharm_source_02.png index fb918bd..72fd988 100644 Binary files a/assets/git_pycharm_source_02.png and b/assets/git_pycharm_source_02.png differ diff --git a/learning_git.md b/learning_git.md index 4282816..86ee078 100644 --- a/learning_git.md +++ b/learning_git.md @@ -16,16 +16,35 @@ That is the best tool for teamwork. ### Starting a version controlled project +In Pycharm, you have to enable a version control integration. +There are many choices, but we will use Git. +As you can see, Git appears in the toolbar and a git window appear bottom of the window. +And you can identify the current branch that you are in. +So the default branch name is **master**. + ![screenhot](assets/git_pycharm_source_00.png) ![screenhot](assets/git_pycharm_source_01.png) ![screenhot](assets/git_pycharm_source_02.png) +Let's try to write some code +And add all contents that we write in a git repository. + ![screenhot](assets/git_pycharm_source_03.png) +In the commit window, we can see file project. +But we had three important things. +We have a textBox and two buttons. +In the textBox, you can write a comment when you commit. +The _Commit_ button is used to save all change in your project. +The _Commit and Push_ is used to commit and push the project in a Git. + ![screenhot](assets/git_pycharm_source_04.png) +When you press the _Commit and Push_, a new window appears. +You can see which branch and which commit that you push. + ![screenhot](assets/git_pycharm_source_05.png) ![screenhot](assets/git_pycharm_source_06.png)