Hello world

Github Training

2017. 08. 08

day 1

1. github 계정 만들기
2. sourcetree 로 git 사용하기
3. cmd에서 git 사용하기

Calculator.java

pachage com.mycompany.test;

public class Calculator {

  public static void main(String[] args){
    int a = 4;
    int b = 2;
    System.out.println( sum(a,b) );

    System.out.println( minus(a,b) );
  }

  private static int sum(int a, int b){
    return a+b;
  }

  private static int minus(int a, int b, object GPU){
    int result = 0;
    if(GPU == null)
      result = a-b;
    else
      result = a-b;

    return result;
  }

}

2017. 08. 09

day 2

1. Markdown (using haroopad)
2. Mockup (using Balsamiq, oven)
3. git pull
4. git branch
5. git merge , 3 way merge