New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

冲突 #13

Closed

yangchongduo opened this issue Apr 4, 2018 · 1 comment

Labels

invalid wontfix

yangchongduo commented Apr 4, 2018

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

Collaborator

hubcarl commented Apr 4, 2018

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

hubcarl added the wontfix label

hubcarl closed this as completed

hubcarl added the invalid label

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment