github在pull request时出现conflict

PENGZhaoqing / CourseSelect

校园选课系统样本 (a template for course selection system by Ruby on Rails)

https://courseselect.herokuapp.com/

MIT License

106 stars 205 forks source link

Closed chengyunguan closed 7 years ago

chengyunguan commented 7 years ago

这种情况下merge按钮是灰色的不能点，要如何让发起pull request的成员改自己的代码才能重新提交pull request成功

PENGZhaoqing commented 7 years ago

让他们自己在本地去git pull你主分支的代码，然后再pull request过来