git mergeを勉強してみた - Qiita

class Hello { public static void main(String[] args) { System.out.println("hello"); } } $ git init ./ Initialized empty Git repository in /Users/kenta_suzuki/project/git/.git/ $ git add ./ $ git status [~/project/git] On branch master Initial commit Changes to be committed: (use "git rm --cached <file>..." to unstage) new file: .gitignore new file: Hello.java $ git commit -m '初めてのコミット' [master (ro