View source for GSOC 2016 Joomla GIT Workflow

==== Preparation ====

On Github, navigate to the joomla-projects/my-gsoc-project repository and click on the ‘Fork’ button in the upper right corner. This creates a fork (a linked copy) in your account (let’s call it ‘my-user’), resulting in a new repo my-user/my-gsoc-project.

[[Image:Github_flow_1.jpg|1012px|center|link=Github Flow 2016]]


Next step is cloning the forked repository to your local computer. If you set up ssh-keys in GitHub (recommended), use the link with ssh. If not use the https link.

[[Image:Github_flow_2.jpg|900px|center|link=Github Flow 2 2016]]

<source lang="javascript">
git clone -b staging git@github.com:my-user/my-gsoc-project.git
</source>

To keep your fork updated with the changes from joomla-projects, you need to add the joomla-projects repo as additional remote repository (mostly called upstream):

<source lang="javascript">
git remote add upstream https://github.com/joomla-projects/gsoc16**
</source>    
You can now update staging by applying the following command:

<source lang="javascript">
git fetch upstream staging
</source>
    
Next merge the changes:

<source lang="javascript">
git merge upstream/staging
</source>

And push them to your remote fork

<source lang="javascript">
git push
</source>
    

Your mentors are going to keep the joomla-projects repository in sync with joomla/joomla-cms staging. You need to do the same for your fork!