biseo-git

Size: px

Start display at page:

Download "biseo-git"

원재 한
2 years ago
Views:

1 seminar

2 목차 git Github 기본적인명령어들 Pull Request

4 Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency

5 Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and ef iciency f source

6 Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and ef iciency f source

7 - 왜쓸까? -

8 source

9 버전관리란? source

10 버전관리란? 1. 소스코드의변경사항을추적 2. 원활한협업수단제공 source

11 버전관리란? 1. 소스코드의변경사항을추적 2. 원활한협업수단제공 3. 저장소역할 source

12 버전관리툴은다양하다 Apache Subversion (SVN) Mercurial Concurrent Versions System (CVS) GNU Bazaar 등등많더라구요

13 버전관리툴은다양하다 Distributed?? Apache Subversion (SVN) Mercurial Concurrent Versions System (CVS) GNU Bazaar 등등많더라구요

14 버전관리툴은다양하다 Apache Subversion (SVN) Mercurial Distributed?? 참고 1 ( 블로그 ) 참고 2 ( 위키피디아 ) Concurrent Versions System (CVS) GNU Bazaar 등등많더라구요

15 source

16 GitHub is a code hosting platform for version control and collaboration. It lets you and others work together on projects from anywhere.

17 GitHub is a code hosting platform for version control and collaboration. It lets you and others work together on projects from anywhere. git 을이용해협업을용이하게해주는플랫폼! 많은프로젝트들의 central repository 를호스팅하고있다

18 GitHub is a code hosting platform for version control and collaboration. It lets you and others work together on projects from anywhere. git 을이용해협업을용이하게해주는플랫폼! 많은프로젝트들의 central repository 를호스팅하고있다 source source source

19 기본적인명령어들

20 git workflow source

21 git add git add [options] <path> - Add file contents to the index - index! -A all -p patch -e edit

22 git commit git commit [options] - record changes to the repository - repository -a amend -m <msg> message=<msg>

23 About Commit Messages source

24 About Commit Messages 여러개발자들이협업을하는경우 commit message 의틀을맞추어두는경우가많 다. source

25 About Commit Messages 여러개발자들이협업을하는경우 commit message 의틀을맞추어두는경우가많 다. 변화를쉽게파악 로그자동생성 source

26 About Commit Messages 여러개발자들이협업을하는경우 commit message 의틀을맞추어두는경우가많 다. 변화를쉽게파악 로그자동생성 노션페이지참고하기!! source

27 git add. 가습관이되셨나요? 습관이되셨다면바람직하지않습니다!!

28 git add. 가습관이되셨나요? 습관이되셨다면바람직하지않습니다!! Q: 현재 directory 에있는모든변경사항들이한 commit 에들어갈만한내용인가??

29 git add. 가습관이되셨나요? 습관이되셨다면바람직하지않습니다!! Q: 현재 directory 에있는모든변경사항들이한 commit 에들어갈만한내용인가?? 1. feature A 기능개발시작 2. feature A에서사용해야하는 feature B에서버그발견 3. feature B 버그수정 4. feature A 기능구현

30 git branch git branch [options] - List, create, or delete branches - -d delete -l list -a all <branch-name>

31 feature branch git branch! feature/xxx source

32 git checkout git checkout [options] <branch commit> - Switch branches or restore working tree files - <commit> <branch-name> -b <filename>

33 git checkout git checkout [options] <branch commit> - Switch branches or restore working tree files - <commit> <branch-name> -b git checkout , git 2.23 switch restore. <filename>

34 git log git log [options] - Show commit logs - commit all decorate oneline graph source

35 git remote git remote <command> - Manage set of tracked repositories - repository add <name> <repository> remove <name> rename <old> <new> -v verbose

36 git push git push [options] <repository> - Update remote repository along with associated changes - repository -u set-upstream -d delete -f force

37 git pull git pull [options] <repository> - Fetch from and integrate with another repository or a local branch - repository local repository -r rebase

38 git merge git merge [options] - Join two or more development histories together - GitHub Pull Request!!

39 git merge - Fast Forward Merge - fast-forward 가능! source - Three Way Merge - fast-forward 불가능! Merge Commit 생김! source

40 Merge Conflicts File A 의 Line 1 수정 변경사항이다르다면어떤것을선택해야할까? File A 의 Line 1 수정 Merge Conflict!

41 Merge Conflicts 같은코드를수정하는것은불가피하지만, 피할수있으면피하자! 분업을통해일정부분해결가능

42 Common Workflow 1. feature branch 생성 2. 열심히개발 3. 적절한단위로 add & commit 4. remote 브랜치로 push 5. Pull Request 생성 6. Merge

43 Pull Request Description: Merge 하고자하는 branch 가반영한변경사항설명 Assignees: 해당기능을담당한유저 ( 들 ) Reviewers: Pull Request 를검토할유저 ( 들 ) Pull Request 생성이후에도 commit 추가가능! Files Changed와 Commit 탭을통해변경사항확인가능! 댓글달기가능! 파일둘러본뒤 Approve 가능!

44 Pull Request

45 Merge 이후에 Github 에서호스팅하는 Central Repository 가변경되었기때문에 로컬에있는 repository 와의동기화필요. 변경된브랜치로이동해 git pull 실행!

46 다루지못한명령어들 rm reset switch store rebase stash clone diff blame cherry-pick mv fetch init config 100

47 질문있나요?

48 감사합니다

github_introduction.key

github_introduction.key Github/Git Starter Guide for Introductory Level Curtis Kim @ KAKAO Why Github/Git? - :, - - Q1 :? - Q2 :? - Q3 : ( )? - Q4 :? - Github/Git. Old Paradigm : - - a.java.. Git. - - - - - - - - - (commit &