Apache9 commented on issue #91: HBASE-21257 misspelled words.[occured -> occurred] URL: https://github.com/apache/hbase/pull/91#issuecomment-480593757 You have some merge commits in your own repo, which leads to conflicts. I suggest you record the commit id 'fcfa14e2f176d19e9ce984fe4687c3e1fd57e66f', and then reset to an earlier commit before the merge commits, and then sync with the master branch of apache/hbase again, and then cherry-pick the 'fcfa14e2f176d19e9ce984fe4687c3e1fd57e66f'. And last, do a force push your master branch.
---------------------------------------------------------------- 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: [email protected] With regards, Apache Git Services
