Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

  1. Clone the ASF git repository (if you haven't done yet)

    Code Block
     git clone https://git-wip-us.apache.org/repos/asf/incubator-geode.git
    
  2. Add GitHub remote

    Code Block
     git remote add github https://github.com/apache/incubator-geode
    
  3. (for local review) Fetch the pull request into a feature branch for review

    Code Block
     git fetch github pull/6/head:feature/GEODE-41
    git checkout feature/GEODE-41
    Where:
    6 -> PR number
    feature/GEODE-41 -> local destination branch
    
  4. (for local review) After review is complete you can merge the feature into develop and remove the branch

    Code Block
     git flow feature finish GEODE-41 -F
    Switched to branch 'develop'
    Your branch is up-to-date with 'origin/develop'.
    Updating f7af251..1f2e32a
    Fast-forward
    COMPILING.txt | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)
    Deleted branch feature/GEODE-41 (was 1f2e32a).
    Summary of actions:
    - The feature branch 'feature/GEODE-41' was merged into 'develop'
    - Feature branch 'feature/GEODE-41' has been removed
    - You are now on branch 'develop'
    
  5. (if review was done through GitHub) Pull and squash the pull request

    Code Block
     git pull --squash github pull/6/head
    
  6. Review the changes and rebase if necessary to clean up and modify the history. If there are multiple commits, you may want to squash them together. Remember to add 'close #6' to the last commit message so that github will automatically close the PR.

     

    Code Block
    git log
    git rebase -i
    Execute a commit amend in order close the PR (For example, append:  "close #6")
    Code Block
     git commit --amend

Finally push the commit the origin repository

...