====== Git for phpFreeChat's integrators ======

Here is few tips to help pfc integrators to merge external contributions into the official branch.

Contributors will submit pull request from github interface. You will review the code and accept or not the contribution. If you accept it, you can merge it to the official source code in two ways:
  - If you don't have anything to test or patch, you merge the contribution directly trough github Web interface: "Fork Queue"
  - If you have to test the contribution locally before publishing the source code:
    * The official repository has to be cloned locally: <code bash>git clone git@github.com:kerphi/phpfreechat.git</code>
    * Add a remote branch on your local repository: <code bash>git remote add cweener https://github.com/Cweener/phpfreechat.git</code>
    * Merge all changes to your master branch: <code bash>git pull Cweener master</code> or just cherry-pick  few commits: <code bash>git cherry-pick 3821c98c15f79f46f16d</code> (notice: the commit id can be found from the github interface)
    * Test and modify things if necessary and commit:<code bash>git commit -a</code>
    * Push it to github: <code bash>git push</code> 

When you commit things to the official pfc source code, don't forget to edit the [[:changelog|changelog]] on the phpfreechat website.