Fork and Branch Git Workflow Cheat Sheet. How to use (+require by composer) and maintain forked library, contributing updates to the main library repository.

fork-and-branch-flow.md

MAKE FORK

• github.com: click Fork button
• git clone fork-git-url
• git remote add upstream parent-repo-url

WORK WITH FORK

• git checkout -b new-feature-branch
• git add .
• git commit -m “short yet descriptive message”
• git push origin new-feature-branch

PULL REQUEST

• possibly git rebase
• github.com: click New pull request button

AFTER PULL REQUEST MERGE

• git branch -d merged-feature-branch
• git push --delete origin merged-feature-branch

PARENT REPO SYNCING TO A FORK

Detailed

• git fetch upstream
• git checkout master
• git merge upstream/master
• git push origin master

Fast

• git pull upstream master
• git push origin master

COMPOSER

{
    "repositories": [
        {
            "type": “git",
            "url": “fork-git-url"
        }
    ],
    "require": {
        “parent/name": "dev-bugfix"
    }
}

Based On

• http://blog.scottlowe.org/2015/01/27/using-fork-branch-git-workflow/
• https://help.github.com/articles/configuring-a-remote-for-a-fork/
• https://help.github.com/articles/syncing-a-fork/
• https://getcomposer.org/doc/05-repositories.md#vcs