Github user jeking3 commented on the issue:

    https://github.com/apache/thrift/pull/1491
  
    This squash was not done properly.  It includes all of the master commits 
in it.
    
    You want to start with an updated master:
    
    git checkout master
    git pull
    
    Then you want to branch:
    git checkout -b THRIFT-4489-squashed
    
    Then you want to merge with squash, pulling anything in uds-nodejs over to 
THRIFT-4489-squashed
    git merge --squash uds-nodejs
    
    Then commit and add your description for your changes.
    Then push that branch and let me know when it is in your fork, and I will 
pull it and merge it.  No need to update this PR or open a new one.



---

Reply via email to