pr太多了，几十个文件的修改，我该如何合并啊，git merge --no-ff 这样可以保留提交点，但是其中有些提交我又不想要，我现在该怎么做，才能合并其中想要的东西，我的思路是 现合并过来，在修改，在提交，在一个就是手动合并过来 。。。
黄舟2017-05-02 09:22:07
You should tell him what is necessary and what is not, and ask him to modify the PR before merging it, instead of modifying it after you merge it.
Firstly, the process should be like this, and secondly, it is also a matter of respect and negotiation.
