Github user srdo commented on the issue:

    https://github.com/apache/storm/pull/1835
  
    @liurenjie1024 You have access. You need to open your branch in the Git 
client you usually use and pull the latest commits from master on this repo 
(https://github.com/apache/storm.git). If you like you can use `git pull 
--rebase` to avoid a merge commit in the history. Once your branch is up to 
date, push it back to your fork. The PR will update automatically.
    
    Here's an example of how it can be done from command line (I have a remote 
called "upstream" that points to this repository, if you don't have one like it 
use `git remote add upstream https://github.com/apache/storm.git` to add it).
    ```
    git checkout STORM-2236
    git pull upstream master --rebase //you'll get a merge conflict
    git mergetool //resolve merge conflict (you can also use whatever git GUI 
you usually use)
    git add <the files you resolved conflicts for>
    git rebase --continue
    //do the above 3 lines until the rebase is over
    //At this point you should verify that the branch diff to master looks 
reasonable. If it looks fine, push to your branch with the following.
    git push --force
    ```



---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

Reply via email to