search

ust-helloworld / The-Avengers-forming

This project is an application skeleton. It is used for a HKUST Software Engineering Course (COMP3111/H) in Fall 2016/17. My goal: The project is not asking students to re-produce the sample project. We should encourage students to do something better than the TA.
https://course.cse.ust.hk/comp3111/teamform/
MIT License
0 stars 6 forks source link

Does using merge can reduce the "always ahead" problem? #75

Closed p-wong1124 closed 7 years ago

p-wong1124 commented 7 years ago

As I encounter a problem that, my repo is always 10-20 ahead of team repo. And I suspect that using squash and merge will cause it, (as it might not recognize the changes made between local repo and the team repo). Does it help if we allow merge all commit?

wai2016 commented 7 years ago

Merge could help I think. But you have to solve all conflicts.

p-wong1124 commented 7 years ago

OK I can use another master to replace this lol

在 wai2016 notifications@github.com，2016年11月23日 下午1:39寫到：

Merge could help I think But you have to solve all conflicts.

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHubhttps://github.com/ust-helloworld/The-Avengers-forming/issues/75#issuecomment-262438165, or mute the threadhttps://github.com/notifications/unsubscribe-auth/AVTZOae4WCYoE9yJl0EKD-goI21dxZlSks5rA9GMgaJpZM4K312t.