search

easy-team / egg-react-webpack-boilerplate

Egg React Server Side Render(SSR) / Client Sider Render(CSR)
https://easyjs.cn/egg-react
MIT License
671 stars 93 forks source link

冲突 #13

Closed yangchongduo closed 6 years ago

yangchongduo commented 6 years ago

我从master 分支，切换到 feature/green/spa 有冲突

hubcarl commented 6 years ago

切分支怎么会有冲突，是不是pull方式不对