How to make a Pull Request

In order to submit a Pull Request, follow this procedure

Requirements

  • Trunk repository
    • master branch in trunk repository
  • Forked repository
    • master branch in forked repository
  • Local repository
    • master local branch
    • custom local branch

Analysis

  • Rebase the master local branch with changes at Trunk repository
  • Rebase the custom local branch with changes at master local branch
  • Push the custom local branch at the Forked repository

Process

1. Configure "upstream" pointing to the Trunk repository

$ git remote add upstream github@github.com:ORIGINAL_OWNER/ORIGINAL_REPOSITORY.git

2. Checkout the master local branch

$ git checkout master

2. Link master local branch with upstream/master branch

$ git branch -u upstream/master

3. Rebase the master local branch with the changes at the Trunk respository

$ git pull --rebase 

​4. Checkout the custom local branch

$ git checkout customLocalBranch

4. Rebase the custom local branch with changes at master local branch

$ git rebase master

5. Push the custom local branch to the Forked repository

​$ git push origin customLocalBranch