Tizen/Artik IoT Practice Part 4 Open Source Development

Transcription

1 1 Tizen/Artik IoT Practice Part 4 Open Source Development Sungkyunkwan University

2 Contents 2 SCM Tool: Git Version Management Local & Remote Repository Branch Management Github Contribution Process Issue Fork Project Pull Request

3 Git: Key Concepts Working directory Source code in work add command: adds files/directories to staging area Staging area(index) Source code to be committed commit command: makes a new version in repository Repository(HEAD) Source code already committed Files or directories are stored as contentaddressable objects identifiable by hash value. 3 Working Directory Add Staging Area Commit (Local) Repository Ver.2 Ver.1

4 Git: Version Management (1/2) Add a source code, pp 1. Add to staging area 1. $ git add 2. Make a new version 1. $ git commit -m commit message Add all of the source code 1. Add all of the source code 1. $ git add --all 2. Make a new version 1. $ git commit -m commit message Display staging area s status 1. $ git status 4 Working Directory Add Staging Area Commit (Local) Repository Ver.2 Ver.1

5 Git: Version Management (2/2) 5 Display the commit log 1. $ git log Each commit s hash value, author information, date, message commit 783c82ff64eda9f de906eca77d01f691 Author: Gyeonghwan Hong <redcarrottt@gmail.com> Date: Mon Sep 22 10:37: nd version commit: is added commit bb31bf85430e1a027abe197e5b88a26110 Author: Gyeonghwan Hong <redcarrottt@gmail.com> Date: Thu Aug 28 12:08: st version commit: is added Return to a previous version 1. git checkout <commit s hash value> ex. git checkout bb31bf85430e1a027abe197e5b88a26110 Working Directory Add Staging Area Commit (Local) Repository Ver.2 Ver.1

6 Git: Local & Remote Repository (1/2) 6 Commit Make a new version on local repository Push Upload commits in local repository to remote repository Pull Download commits in remote repository to local repository Github Server (Remote) (Remote) Repository Ver.2 Ver.1 Push Pull Local PC Working Directory Add Staging Area Commit (Local) Repository Ver.2 Ver.1

7 Git: Local & Remote Repository (2/2) 7 Upload to remote repository 1. $ git push <remote name> <remote branch> ex. $ git push origin master Download from remote repository 1. $ git pull Github Server (Remote) (Remote) Repository Ver.2 Ver.1 Push Pull Local PC Working Directory Add Staging Area Commit (Local) Repository Ver.2 Ver.1

8 Git: Branch Management (1/3) 8 Check the branch list of local repository 1. $ git branch --list Check the branch list of remote repository 1. $ git branch --remote * master feature_x Move to another branch 1. $ git checkout <branch name> ex. $ git checkout feature_x

9 Git: Branch Management (2/3) 9 Develop a new feature by making a new branch 1. Make a new branch feature_x 1. $ git branch feature_x 2. $ git checkout feature_x 2. Edit and commit source code 3. Merge feature_x branch to original branch 1. $ git checkout master 2. $ git merge feature_x

10 Git: Branch Management (3/3) 10 Conflict When merging feature_y branch to master branch, in version 2-x and 2-y have different changes each other. This situation is called as conflict. The conflict should be resolved by conflict resolution process. 1. $ git mergetool

11 Github Contribution: 1. Issue 11 Issue Suggestion of new feature, bug fix, enhancement in Github community After discussion on the issue with project s collaborators, project s direction is determined Assign an Issue Project collaborators can assign an issue to specific developers.

12 Github Contribution: 2. Fork Project 12 Fork Project In order to contribute to Project, fork the Github repository to the own repository, then start to implement the new feature.

13 Github Contribution: 2. Fork Project 13 Fork Project Option 1. Clone forked project onto local PC $ git clone ID>/<repository name> Option 2. Add a remote server $ git remote add <server name> ID>/<repository name> $ git pull <server name> <branch name>

14 Github Contribution: 3. Pull Request Pull Request Click New pull request button, then create pull request message After the review and vote of maintainers, the pull request is determined to be merged or rejected.