Hi Willem Jiang, First of all, thank you for your question.
Firstly, regarding the merging of PRs, we encountered the same issue as tisonkun before[1]. During the merge process, we are unable to select the "Rebase and merge" option and are forced to choose "Squash and merge." This results in the effect of merging commits that you mentioned. We can confirm that we cannot select the "Create a merge commit" and "Rebase and merge" options. Furthermore, there are *no conflicts* between our branch and the main branch during the merge, *as we also attempted a manual merge without conflicts*. Additionally, we cannot resolve this issue through manual merging because we cannot push directly to the main branch using git commands; we can only merge the PR using the GitHub web UI. In conclusion, we have no other choice but to select the "Squash and merge" option. Secondly, regarding the issue you mentioned about contributors not being displayed in the contributors graph, we have just verified it. *All contributors from the latest version are shown in the contributors graph.* If you did not see them, we believe this issue might be due to GitHub's caching, as the contributors graph is not real-time maybe. Below is the list of contributors, excluding members from our internal team. [x] hgaol [x] xpume [x] zahash [x] hbsciw [x] sy-records [x] foxzero-007 [x] surapuramakhil [x] Octobug Lastly, thank you again for your question. If you have any other suggestions, please feel free to continue sharing and discussing. [1] https://github.com/apache/incubator-answer/pull/633 Best regards, LinkinStar On Mon, Apr 1, 2024 at 8:30 AM Willem Jiang <willem.ji...@gmail.com> wrote: > Hi, > > When I reviewed the release of the answer, I just found there are not > many commits on the main branch. After digging more on the commit > log, I found we just have a big PR[1] with multiple commits to merge > the release branch to the main branch within a single commit. > > This approach brings some trouble for the user to look up the patches > and for the system to count the contributions of the developer. If you > take a look at the contributors graph[2] from GitHub, the recent > contribution graph cannot show all the contributions. > > My question is why did we switch to the single commit release model? > > [1]https://github.com/apache/incubator-answer/pull/876 > [2]https://github.com/apache/incubator-answer/graphs/contributors > > Willem Jiang > > Twitter: willemjiang > Weibo: 姜宁willem > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@answer.apache.org > For additional commands, e-mail: dev-h...@answer.apache.org > >
