Develop tips

How to merge pull request

1. In the top-right corner of the page, click Fork.

2. Create a local clone of your fork

   $ git clone git@github.com/YOUR-USERNAME/tebukuro
   

3. Specify a new remote upstream repository that will be synced with the fork.

   $ git remote add upstream git@github.com:shinosakarb/tebukuro.git
   

4. Incorporate the latest state

   $ git fetch upstream
   $ git rebase upstream/master
   

5. In the top-left of your repository page of your github, click New pull request.

---

How to checkout pull request

e.g. PR#11

$ git fetch upstream pull/11/head:pull_11
$ git checkout pull_11

Add git alias to .gitconfig

[alias]
  pr = "!f() { git fetch -fu ${2:-$(git remote |grep ^upstream || echo origin)} refs/pull/$1/head:pr/$1 && git checkout pr/$1; }; f"

$ git pr 11

Skip CI

Add [ci skip] in your commit message

e.g.

$ git commit -am "[ci skip] Change README"