You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@guacamole.apache.org by GitBox <gi...@apache.org> on 2020/10/30 08:25:29 UTC

[GitHub] [guacamole-client] XYUU edited a comment on pull request #527: GUACAMOLE-903: Improved Chinese internationalization support

XYUU edited a comment on pull request #527:
URL: https://github.com/apache/guacamole-client/pull/527#issuecomment-719405196


   > Hi @XYUU, the commits for this PR still show two duplicate messages:
   > 
   > ![Duplicate commits](https://user-images.githubusercontent.com/4632905/97648889-22792e80-1a13-11eb-8e5f-228fe84b6cc2.png)
   > 
   > As @necouchman mentioned, can you please:
   > 
   > > Either collapse all of your commits into a single commit, or update the commit messages such that they describe the actual changes being made in each of the commits instead of a generic message ...
   > 
   > Thanks!
   > 
   > Reviewing the translation changes themselves, things look fine to me. The only issue I see is with the existence of those two duplicate commits.
   
   I also don't want to have two identical submissions. This is because after 4 months, when I checked whether the request was merged, I found a code conflict, and then I resolved the conflict. Since these two commit are not adjacent, I cannot merge them into a single commit.
   
   Is there a better way? I want to hear your suggestions.


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org