{"push_id":737749044,"size":5,"distinct_size":1,"ref":"refs/heads/master","head":"3f47a3973fa9ffc5be4e20ef68a54c71b23c2c7b","before":"54f479590ef7148097064064db04b5e8082531ee","commits":[{"sha":"c6aff0c202e9ce42135e99a5c54e7d9c35244022","author":{"email":"b3f3d857ed800dfa31c4573fe9a477288009051c@gmail.com","name":"hosoai"},"message":"一応３WayMergeできてるっぽい．\nConflict時の処理を追加する必要あり","distinct":false,"url":"https://api.github.com/repos/s-hosoai/astahm2t/commits/c6aff0c202e9ce42135e99a5c54e7d9c35244022"},{"sha":"8e3094f96a5fdb2b0be51956888d0c1f813c8ad1","author":{"email":"b3f3d857ed800dfa31c4573fe9a477288009051c@gmail.com","name":"hosoai"},"message":"とりあえず3WayMergeできたっぽい","distinct":false,"url":"https://api.github.com/repos/s-hosoai/astahm2t/commits/8e3094f96a5fdb2b0be51956888d0c1f813c8ad1"},{"sha":"d5646b9e9b83b42165a7e8a67399835a14c7cf23","author":{"email":"b3f3d857ed800dfa31c4573fe9a477288009051c@gmail.com","name":"hosoai"},"message":"テンプレートファイル類の更新が出来ていなかったため修正．また，デフォルトで設定されるテンプレートの設定が漏れていたため修正","distinct":false,"url":"https://api.github.com/repos/s-hosoai/astahm2t/commits/d5646b9e9b83b42165a7e8a67399835a14c7cf23"},{"sha":"fe9927c3ce62896a44602c50264c043cf21ceb01","author":{"email":"b3f3d857ed800dfa31c4573fe9a477288009051c@gmail.com","name":"hosoai"},"message":"生成コードのキャッシュがない場合にぬるぽになっていたため，修正","distinct":false,"url":"https://api.github.com/repos/s-hosoai/astahm2t/commits/fe9927c3ce62896a44602c50264c043cf21ceb01"},{"sha":"3f47a3973fa9ffc5be4e20ef68a54c71b23c2c7b","author":{"email":"b3f3d857ed800dfa31c4573fe9a477288009051c@gmail.com","name":"s-hosoai"},"message":"Merge pull request #1 from s-hosoai/3waymerge\n\n3waymerge","distinct":true,"url":"https://api.github.com/repos/s-hosoai/astahm2t/commits/3f47a3973fa9ffc5be4e20ef68a54c71b23c2c7b"}]}