{"push_id":687949949,"size":13,"distinct_size":2,"ref":"refs/heads/pyh","head":"ddff9875efd11bc0924b41bcfa85a5b326bb87b2","before":"755158e1613012f97bfec0c7085beb91cd7ca3d6","commits":[{"sha":"cbf6ee3846b680b9638a0cdcf7180d78c6423079","author":{"email":"e8f642950386c0cf0bd8dadff53a13f55811b041@naver.com","name":"fellownew"},"message":"메타 데이터","distinct":false,"url":"https://api.github.com/repos/fellownew/project_workspace/commits/cbf6ee3846b680b9638a0cdcf7180d78c6423079"},{"sha":"29b9a7a3cc11f7089a00b9f208f2dca69b5d2b03","author":{"email":"e8f642950386c0cf0bd8dadff53a13f55811b041@naver.com","name":"fellownew"},"message":"Merge remote-tracking branch 'project_workspace/pyh'\n\nConflicts:\n\t.metadata/.plugins/org.eclipse.core.resources/.projects/shoppingmall/.indexes/5b/a8/a5/a2/11/history.index\n\t.metadata/.plugins/org.eclipse.core.resources/.projects/shoppingmall/.indexes/5b/a8/a5/a2/66/history.index\n\t.metadata/.plugins/org.eclipse.core.resources/.projects/shoppingmall/.markers\n\t.metadata/.plugins/org.eclipse.core.resources/.projects/shoppingmall/org.eclipse.jdt.core/state.dat\n\t.metadata/.plugins/org.eclipse.core.resources/.projects/shoppingmall/org.eclipse.wst.jsdt.core/state.dat\n\t.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index\n\t.metadata/.plugins/org.eclipse.core.resources/.root/84.tree\n\t.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources\n\t.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi\n\t.metadata/.plugins/org.eclipse.jdt.core/1397729945.index\n\t.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps\n\t.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt\n\t.metadata/.plugins/org.eclipse.jst.jsp.core/taglibindex/1397729945.dat\n\t.metadata/.plugins/org.eclipse.m2e.core/nexus/26522e0d83a422eed93329ece7565cfc/_23_1.del\n\t.metadata/.plugins/org.eclipse.m2e.core/nexus/26522e0d83a422eed93329ece7565cfc/_2m_1.del\n\t.metadata/.plugins/org.eclipse.m2e.core/nexus/26522e0d83a422eed93329ece7565cfc/_2n_1.del\n\t.metadata/.plugins/org.eclipse.m2e.core/nexus/26522e0d83a422eed93329ece7565cfc/segments.gen\n\t.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_2c_1.del\n\t.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_2w_1.del\n\t.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_2x_1.del\n\t.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/segments.gen\n\t.metadata/.plugins/org.eclipse.m2e.core/nexus/dec210992cf6017083cae721ed631be6/_m_1.del\n\t.metadata/.plugins/org.eclipse.m2e.core/nexus/dec210992cf6017083cae721ed631be6/_n_1.del\n\t.metadata/.plugins/org.eclipse.ui.workbench.texteditor/dialog_settings.xml\n\t.metadata/.plugins/org.eclipse.wst.jsdt.core/indexes/1397729945.index\n\t.metadata/.plugins/org.eclipse.wst.jsdt.core/indexes/savedIndexNames.txt\n\t.metadata/.plugins/org.eclipse.wst.jsdt.web.core/jssearch/338116390.index\n\t.metadata/.plugins/org.eclipse.wst.jsdt.web.core/jssearch/4027656915.index\n\t.metadata/.plugins/org.eclipse.wst.server.core/publish/publish1.dat\n\t.metadata/.plugins/org.eclipse.wst.server.core/tmp0/publish.txt\n\t.metadata/.plugins/org.eclipse.wst.validation/dep.index\n\t.metadata/version.ini\n\tshoppingmall/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF\n\tshoppingmall/target/m2e-wtp/web-resources/META-INF/maven/kr.co.taommall/taommall/pom.properties","distinct":false,"url":"https://api.github.com/repos/fellownew/project_workspace/commits/29b9a7a3cc11f7089a00b9f208f2dca69b5d2b03"},{"sha":"87a5605b899d9c278a64ec2023448b0452620017","author":{"email":"e8f642950386c0cf0bd8dadff53a13f55811b041@naver.com","name":"fellownew"},"message":"메타데이터","distinct":false,"url":"https://api.github.com/repos/fellownew/project_workspace/commits/87a5605b899d9c278a64ec2023448b0452620017"},{"sha":"d8a903c38a9cdc5862a03bbd2bc66dfdf3d3a8c4","author":{"email":"e8f642950386c0cf0bd8dadff53a13f55811b041@naver.com","name":"fellownew"},"message":"상품 리스트 css","distinct":false,"url":"https://api.github.com/repos/fellownew/project_workspace/commits/d8a903c38a9cdc5862a03bbd2bc66dfdf3d3a8c4"},{"sha":"31c794394bd7d13edbb5cff52822212706aa2ed9","author":{"email":"e8f642950386c0cf0bd8dadff53a13f55811b041@naver.com","name":"fellownew"},"message":"Merge remote-tracking branch 'project_workspace/cjhm'","distinct":false,"url":"https://api.github.com/repos/fellownew/project_workspace/commits/31c794394bd7d13edbb5cff52822212706aa2ed9"},{"sha":"70e0217da0028f81cf536363815fb340624e1a00","author":{"email":"e8f642950386c0cf0bd8dadff53a13f55811b041@naver.com","name":"fellownew"},"message":"Merge remote-tracking branch 'project_workspace/pyh'\n\nConflicts:\n\t.metadata/.plugins/org.eclipse.core.resources/.projects/shoppingmall/.indexes/5b/a8/a5/a2/66/history.index\n\t.metadata/.plugins/org.eclipse.core.resources/.projects/shoppingmall/org.eclipse.jdt.core/state.dat\n\t.metadata/.plugins/org.eclipse.core.resources/.projects/shoppingmall/org.eclipse.wst.jsdt.core/state.dat\n\t.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap\n\t.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources\n\t.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi\n\t.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps\n\t.metadata/.plugins/org.eclipse.jst.jsp.core/taglibindex/1397729945.dat\n\t.metadata/.plugins/org.eclipse.m2e.core/nexus/26522e0d83a422eed93329ece7565cfc/segments.gen\n\t.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/segments.gen\n\t.metadata/.plugins/org.eclipse.wst.jsdt.core/indexes/savedIndexNames.txt\n\t.metadata/.plugins/org.eclipse.wst.jsdt.web.core/jssearch/338116390.index\n\t.metadata/.plugins/org.eclipse.wst.jsdt.web.core/jssearch/4027656915.index\n\t.metadata/.plugins/org.eclipse.wst.server.core/publish/publish1.dat\n\t.metadata/.plugins/org.eclipse.wst.server.core/tmp0/publish.txt\n\t.metadata/.plugins/org.eclipse.wst.validation/dep.index\n\t.metadata/version.ini\n\tshoppingmall/WebContent/WEB-INF/view/body/buyer/buyer_order_form.jsp\n\tshoppingmall/WebContent/WEB-INF/view/body/member/member_order_complete.jsp\n\tshoppingmall/target/m2e-wtp/web-resources/META-INF/maven/kr.co.taommall/taommall/pom.properties","distinct":false,"url":"https://api.github.com/repos/fellownew/project_workspace/commits/70e0217da0028f81cf536363815fb340624e1a00"},{"sha":"5ccf70a87d888f3c1f9a2d4be7303a5f12beece6","author":{"email":"0f2a77e356cd3be11963775331fa14cae5901ffc@gmail.com","name":"close852"},"message":"Merge branch 'pyh' of https://github.com/fellownew/project_workspace\ninto cjhm\n\nConflicts:\n\tshoppingmall/WebContent/WEB-INF/view/body/buyer/buyer_order_form.jsp\n\tshoppingmall/WebContent/WEB-INF/view/body/member/member_order_complete.jsp","distinct":false,"url":"https://api.github.com/repos/fellownew/project_workspace/commits/5ccf70a87d888f3c1f9a2d4be7303a5f12beece6"},{"sha":"3be7a452c79c04144bc89d413532666f7fc771bd","author":{"email":"0f2a77e356cd3be11963775331fa14cae5901ffc@gmail.com","name":"close852"},"message":"Merge branch 'master' of https://github.com/fellownew/project_workspace\ninto cjhm\n\nConflicts:\n\tshoppingmall/WebContent/WEB-INF/view/body/member/member_order_complete.jsp\n\tshoppingmall/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF","distinct":false,"url":"https://api.github.com/repos/fellownew/project_workspace/commits/3be7a452c79c04144bc89d413532666f7fc771bd"},{"sha":"27ea01f76bf19fd473e4322fd991acd5d35e495e","author":{"email":"e8f642950386c0cf0bd8dadff53a13f55811b041@naver.com","name":"fellownew"},"message":"상품 정보수정하기 / 완료","distinct":false,"url":"https://api.github.com/repos/fellownew/project_workspace/commits/27ea01f76bf19fd473e4322fd991acd5d35e495e"},{"sha":"5b34a30d387075871a9d7c7cdd45852332e8716f","author":{"email":"e8f642950386c0cf0bd8dadff53a13f55811b041@naver.com","name":"fellownew"},"message":"Merge remote-tracking branch 'project_workspace/pyh'\n\nConflicts:\n\t.metadata/.plugins/org.eclipse.core.resources/.projects/shoppingmall/.indexes/5b/a8/a5/a2/66/history.index\n\t.metadata/.plugins/org.eclipse.core.resources/.projects/shoppingmall/.indexes/5b/a8/a5/a2/b3/history.index\n\t.metadata/.plugins/org.eclipse.core.resources/.projects/shoppingmall/org.eclipse.jdt.core/state.dat\n\t.metadata/.plugins/org.eclipse.core.resources/.projects/shoppingmall/org.eclipse.wst.jsdt.core/state.dat\n\t.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap\n\t.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources\n\t.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi\n\t.metadata/.plugins/org.eclipse.jdt.core/1397729945.index\n\t.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps\n\t.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt\n\t.metadata/.plugins/org.eclipse.jst.jsp.core/taglibindex/1397729945.dat\n\t.metadata/.plugins/org.eclipse.m2e.core/nexus/26522e0d83a422eed93329ece7565cfc/segments.gen\n\t.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/segments.gen\n\t.metadata/.plugins/org.eclipse.wst.jsdt.core/indexes/1397729945.index\n\t.metadata/.plugins/org.eclipse.wst.jsdt.core/indexes/savedIndexNames.txt\n\t.metadata/.plugins/org.eclipse.wst.server.core/publish/publish1.dat\n\t.metadata/.plugins/org.eclipse.wst.server.core/tmp0/publish.txt\n\t.metadata/.plugins/org.eclipse.wst.validation/dep.index\n\t.metadata/version.ini\n\tshoppingmall/WebContent/WEB-INF/view/body/member/member_order_complete.jsp\n\tshoppingmall/target/m2e-wtp/web-resources/META-INF/maven/kr.co.taommall/taommall/pom.properties","distinct":false,"url":"https://api.github.com/repos/fellownew/project_workspace/commits/5b34a30d387075871a9d7c7cdd45852332e8716f"},{"sha":"c082605204a4858f78b75e465b5c61abe9fb6696","author":{"email":"e8f642950386c0cf0bd8dadff53a13f55811b041@naver.com","name":"fellownew"},"message":"Merge remote-tracking branch 'project_workspace/cjhm'\n\nConflicts:\n\tshoppingmall/target/m2e-wtp/web-resources/META-INF/maven/kr.co.taommall/taommall/pom.properties","distinct":false,"url":"https://api.github.com/repos/fellownew/project_workspace/commits/c082605204a4858f78b75e465b5c61abe9fb6696"},{"sha":"69f488682f6f37f612c1cd54a1b6545578b51241","author":{"email":"53a68b43cdb03b137c2e300f64ce3a4a16fbfb33@naver.com","name":"secret8060"},"message":"Merge branch 'master' of https://github.com/fellownew/project_workspace into pyh\n\nConflicts:\n\t.metadata/.plugins/org.eclipse.jdt.core/1397729945.index\n\t.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt\n\t.metadata/.plugins/org.eclipse.wst.jsdt.core/indexes/1397729945.index\n\tshoppingmall/WebContent/WEB-INF/view/body/member/member_order_complete.jsp","distinct":true,"url":"https://api.github.com/repos/fellownew/project_workspace/commits/69f488682f6f37f612c1cd54a1b6545578b51241"},{"sha":"ddff9875efd11bc0924b41bcfa85a5b326bb87b2","author":{"email":"53a68b43cdb03b137c2e300f64ce3a4a16fbfb33@naver.com","name":"secret8060"},"message":"Merge branch 'master' of https://github.com/fellownew/project_workspace into pyh\n\nConflicts:\n\t.metadata/.plugins/org.eclipse.core.resources/.root/89.tree\n\t.metadata/.plugins/org.eclipse.jdt.core/1397729945.index\n\t.metadata/.plugins/org.eclipse.m2e.core/nexus/26522e0d83a422eed93329ece7565cfc/_2n_1.del\n\t.metadata/.plugins/org.eclipse.m2e.core/nexus/26522e0d83a422eed93329ece7565cfc/_2t_1.del\n\t.metadata/.plugins/org.eclipse.m2e.core/nexus/26522e0d83a422eed93329ece7565cfc/_2u_1.del\n\t.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_2y_1.del\n\t.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_37.cfs\n\t.metadata/.plugins/org.eclipse.m2e.core/workspaceState.ser\n\t.metadata/.plugins/org.eclipse.m2e.core/workspacestate.properties\n\t.metadata/.plugins/org.eclipse.wst.jsdt.web.core/jssearch/2463009565.index\n\tshoppingmall/WebContent/WEB-INF/view/body/member/member_order_complete.jsp\n\tshoppingmall/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF","distinct":true,"url":"https://api.github.com/repos/fellownew/project_workspace/commits/ddff9875efd11bc0924b41bcfa85a5b326bb87b2"}]}