Pull request

[drop-stones]

演習5: ブランチbr-devを切り、いくつかコミットしPull Requestを出せ

• ブランチbr-devを切る

  $ git checkout -b br-dev
  Switched to branch 'br-dev'

• いくつかコミット

  $ echo new-feature1 >> feature
  $ git add .
  $ git commit -m "Add new feature"
  [br-dev 8847dd0] Add new feature
  1 file changed, 1 insertion(+)
  create mode 100644 feature
  $ echo new-feature2 >> feature
  $ git add .
  $ git commit -m "Add new feature2"
  [br-dev 999aa0e] Add new feature2
  1 file changed, 1 insertion(+)

• Pull Requestを出す

  $ git push -u origin br-dev
  Enumerating objects: 7, done.
  Counting objects: 100% (7/7), done.
  Delta compression using up to 2 threads
  Compressing objects: 100% (4/4), done.
  Writing objects: 100% (6/6), 633 bytes | 633.00 KiB/s, done.
  Total 6 (delta 0), reused 0 (delta 0)
  remote: 
  remote: Create a pull request for 'br-dev' on GitHub by visiting:
  remote:      https://github.com/drop-stones/myproj/pull/new/br-dev
  remote: 
  To https://github.com/drop-stones/myproj.git
  * [new branch]      br-dev -> br-dev
  Branch 'br-dev' set up to track remote branch 'br-dev' from 'origin'.

[drop-stones]

演習6: ブランチbr-devのPull Request上でコードにコメントし、コミットをいくつか追加し、マージせよ

• br-devのPull Request url
  • はじめに作った機能を報告しつつ、プルリク
  • レビュアーがfeature3も欲しいと言う
  • feature3を追加コミットする

    $ echo new-feature3 >> feature
    $ git add .
    $ git commit -m "Add feature3"
    [br-dev 3ab5340] Add feature3
    1 file changed, 1 insertion(+)
    $ git push
    Enumerating objects: 5, done.
    Counting objects: 100% (5/5), done.
    Delta compression using up to 2 threads
    Compressing objects: 100% (2/2), done.
    Writing objects: 100% (3/3), 335 bytes | 335.00 KiB/s, done.
    Total 3 (delta 0), reused 0 (delta 0)
    To https://github.com/drop-stones/myproj.git
    999aa0e..3ab5340  br-dev -> br-dev

  • レビュアーのLGTM (Looks good to me!)
  • マージ完了

[drop-stones]

演習7: 受講生誰かのリポジトリをForkし、手元にCloneしてremoteを確認せよ

• Fork, cloneしたリポジトリesperanto9657さんのTank-in-Desert

  $ git clone https://github.com/drop-stones/Tank-in-Desert.git
  Cloning into 'Tank-in-Desert'...
  remote: Enumerating objects: 75, done.
  remote: Counting objects: 100% (75/75), done.
  remote: Compressing objects: 100% (73/73), done.
  remote: Total 75 (delta 5), reused 67 (delta 1), pack-reused 0
  Unpacking objects: 100% (75/75), 1006.52 KiB | 1.13 MiB/s, done.

• remoteを確認すると、自分のアカウントにあるリポジトリ(Forkしたもの)が設定されているのが確認できる

  $ cd Tank-in-Desert/
  $ git remote -v
  origin  https://github.com/drop-stones/Tank-in-Desert.git (fetch)
  origin  https://github.com/drop-stones/Tank-in-Desert.git (push)

[drop-stones]

演習8: Forkしたリポジトリにコミットし、リポジトリ間Pull Requestを作成せよ。
受信したPull Request上で追加コミットを促し、コミットされたらマージせよ。

• Forkしたリポジトリ
  • esperantos9657さんの Tank-in-Desert
  • Pull Requestを作成し、送信したらCloseされました... Add contributors
• 他の人がForkしたリポジトリ
  • esperantos9657さんから myproj
  • マージされるまでの流れ hoshino
  • imshotaさんから Cpp-Programing-Language
  • マージされるまでの流れ nice

[drop-stones]

演習9: GitやGitHubの練習をせよ

Lean Git Branchingの続き

[drop-stones]

Moving Work Around

1. Git Cherry pick
   • git cherry-pick C1 C2 ...: pick commits (C1 C2 ...) and do commits them to the current branch
2. Git Interactive rebase
   • git rebase -i commit-id
   • change commits order: cut and paste for your order
   • modify or delete commits: pick to other keywords

[drop-stones]

A Mixed Bag

1. Locally stacked commits

   $ git checkout master
   $ git cherry-pick bugFix

2. Juggling commits

   $ git rebase -i master
   $ git commit --amend
   $ git rebase -i master
   $ git checkout master
   $ git merge caption

3. Juggling commits 2

   $ git checkout master
   $ git cherry-pick newImage
   $ git commit --amend
   $ git cherry-pick caption

4. Git tags
   • permanent mark (different from branch)

     $ git tag <tag name> <commit id>

5. Git describe
   • git describe <ref> outputs the latest tag form of <tag>_<numCommits>_g<hash>

[drop-stones]

Advanced Topic

1. Rebasing over 9000 times

   • git rebase <upstream> <branch>: do commits of upstream, and do commits of branch

     $ git rebase master bugFix  // master -> bugFix
     $ git rebase bugFix side      // master -> bugFix -> side
     $ git rebase side another    // master -> bugFix -> side -> another
     $ git rebase another master // fast-forward: move master to another

2. Specifying parents

   • HEAD~: 一つ前に戻る
   • HEAD~n: n個前に戻る
   • HEAD^: 一つ前の親の中の先頭要素に戻る
   • HEAD^n: 一つ前の親の中のn番目の要素に戻る

     $ git branch bugWork HEAD~^2~

3. Branch spaghetti

   $ git rebase master one   // fast-forward: one move to master
   $ git rebase -i C1  // change commits of one
   $ git rebase master two  // fast-forward: two move to master
   $ git rebase -i C1 // change commits of two
   $ git rebase C2 three  // fast-forward: three move to C2

All Clear!!