Github user shivaram commented on the pull request:

    https://github.com/apache/spark/pull/8984#issuecomment-146695587
  
    There are a number of ways to do this, so this is just the way I do it 
personally. In my case I have two remotes in my git setup. So my .git/config 
looks something like 
    ```
    ...
    [remote "origin"]
            url = https://github.com/shivaram/spark-1.git
            fetch = +refs/heads/*:refs/remotes/origin/*
    [remote "apache-spark"]
            url = https://github.com/apache/spark.git
            fetch = +refs/heads/*:refs/remotes/apache-spark/*
    ...
    ```
    
    So if I'm on a feature branch say `SPARK-10863` I do the following
    ```
    > git fetch apache-spark master 
    ...
    From https://github.com/apache/spark
     * branch            master     -> FETCH_HEAD
    ...
    > git merge FETCH_HEAD
    ... Accept the merge commit message that shows up
    > git log -2 # Optionally use this to verify if things look fine
    > git push origin SPARK-10863
    ... This will push changes to your fork for this branch
    ```
    
    Let me know if this works for you


---
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 [email protected] or file a JIRA ticket
with INFRA.
---

---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to