github_introduction.key

Size: px

Start display at page:

Download "github_introduction.key"

오현 노
5 years ago
Views:

1 Github/Git Starter Guide for Introductory Level Curtis KAKAO

2 Why Github/Git?

3 - :, - - Q1 :? - Q2 :? - Q3 : ( )? - Q4 :? - Github/Git. Old Paradigm : - - a.java.. Git.

4 (commit & push) (pull request). - (committer) merge pull. - -, - push. - -

6 ,? - -, - -!! - - ( ) :,, - :

7 Github Git Git SourceTree & CLI

8 Git. Checkout :. Pull : ( ). Commit : Push : (Commit).

9 Git (, ). Merge : 1, 2 Rebase : 1, 2

10 Git. - Clone. - Pull. - Checkout. - Commit - Push - -, QA, - Merge - ( ) SourceTree github Repository!

11 Github Repository. Github Create new Repository. public private. Initialize this repository with a README -... Add.ignore - Python -

12 Clone : (github) $ git clone git@github.com:ildoonet/githubpractice.git

13 Log :, 2 (+). $ git log commit 7c138fd071448c71ee260bf474920eff262caa5b Author: Ildoo Kim <ildoo@ildoo.net> Date: Thu Feb 9 13:34: $ Initial commit

14 Pull : SourceTree CLI $ git pull Already up-to-date. * git pull help.

feat-1-default_webserver Switched to branch feat-1-default_web_server' $ git branch *

15 Branch & Checkout : SourceTree CLI $ git branch * master $ git branch feat-1-default_webserver $ git branch feat-1-default_webserver * master $ git checkout feat-1-default_webserver Switched to branch feat-1-default_web_server' $ git branch * feat-1-default_webserver master * - - * ex) feat-2333-web_server * ex) bug-3521-no_log_in_textfile * * * checkout

16 test.py Commit. SourceTree CLI $ git ls-files others # untracked file list test.py $ git add test.py $ git commit -m add test.py file. [feat-1-default_webserver 66f41a5] add test.py file. 1 file changed, 2 insertions(+) create mode test.py * Commit : * Commit,. (push ) * *,,.

17 test.py Commit. feat-1-default_web_server,. Commit (Push ) Github.

Push Push Push $ git push --set-upstream origin feat-1-default_web_server Counting objects: 3, done. Delta compression using up to 8 threads. Compressing objects: 100% (2/2), done.

18 Push Push Push $ git push --set-upstream origin feat-1-default_web_server Counting objects: 3, done. Delta compression using up to 8 threads. Compressing objects: 100% (2/2), done. Writing objects: 100% (3/3), 350 bytes 0 bytes/s, done. Total 3 (delta 0), reused 0 (delta 0) To github.com:ildoonet/github-practice.git * [new branch] feat-1-default_web_server -> feat-1- default_web_server Branch feat-1-default_web_server set up to track remote branch feat-1-default_web_server from origin.

19 Merge (master) 1 / 3 - github pull request merge - pull request - pull request. 2 / 3 $ git checkout master $ git merge feat-1-default_web_server Updating 7c138fd..66f41a5 Fast-forward test.py file changed, 2 insertions(+) create mode test.py 3 / 3

20 Git. - Clone. - Pull. - Checkout. - Commit - Push - -, QA, - Merge - ( )

21 Commit Conflict

22 Commit ,. -.

23 Conflict Commit, Merge Conflict. Conflict 2, <<<<<<< HEAD This is test file. ======= This is a test file. >>>>>>> HEAD ( ) Conflict. << >> Commit. * SourceTree Conflict 2.

24 3 : Reset / Revert / Stash 3 Reset -. - Stash - stash. - stash reset,. Revert - -.

25 3 : Merge / Rebase / Cherry-pick Merge - Rebase -. Cherry-pick -.

26 2 : Blame, Bisect Blame -, Bisect - -

27 Git (1/2)

28 Git (2/2)

29 (ebook) Git GitHub : GitHub : GitHub : Github Gist :

30 : : TDD - -, - - QA, - (1), (2), (3) side-effect, (4). - : Docker, Vagrant - : Chef, Puppet, Ansible :. - :. -.

31 Github/Git Starter Guide for Introductory Level Curtis KAKAO

<3833C8A35FB0F8C7D05FC6AEB7BBB5E55F F466C6F77B8A65FC8B0BFEBC7D15FC8BFB0FAC0FBC0CE5FBCD2BDBA5FC7FCBBF35FB0FCB8AE5F F322E687770>

<3833C8A35FB0F8C7D05FC6AEB7BBB5E55F F466C6F77B8A65FC8B0BFEBC7D15FC8BFB0FAC0FBC0CE5FBCD2BDBA5FC7FCBBF35FB0FCB8AE5F F322E687770> 2014.2.10.[ 제 83 호 ] GIT Flow 를활용한효과적인소스형상관리 Part 2 : GIT Flow 실습과활용예제 소프트웨어공학센터경영지원 TF 팀 C o n t e n t s Ⅰ. GIT Flow 소개 Ⅱ. Branch 전략 Ⅲ. 실제사용예제 Ⅳ. 결론 SW 공학트렌드 동향분석 Webzine Ⅲ. 실제사용예제 1. GIT Flow 사용준비 GIT