Working with GIT

POSSA Github Strategy

As a minimum, all POSSA FreePBX module projects will have a master and a working branch. The master branch will be always be current release version of the sofware, and is configured with a service hook as follows: admin -> Service Hooks -> WebHook URLS -> "http://www.pbxossa.org/gh/webhook.php"

once the webhook is defined, all pushes to the master branch will automatically get packaged into a tarball and stored in: http://www.pbxossa.org/files/<module short name>/ filename-version.tgz

Since the current release version of the module will always be in the master branch, we use the contents of master/module.xml to notify users of version updates.

The working branch will be used to commit all changes. Periodically when it is decided to issue an updated version, any github user with write permission can increment the version number in module.xml and issue a pull request (button at top centre of github page), notifying all POSSA members that there is a version ready for testing and comment. At the end of testing/comments, merge the pull request and the package is automatically created via the webhook.

##Setting up and cloning the repository for the first time
Checking out the Repository into the superfecta directory:
git clone git@github.com:tm1000/Caller-ID-Superfecta.git superfecta

Change directory to the superfecta directory
cd superfecta

Fetch all remote branch information
git fetch

Checkout and track remote branch v2.2.5.x from remote named 'origin'
git branch --track v2.2.5.x origin/v2.2.5.x

##Working with the branches
Update Local Working Copy
git pull

Push/Commit local changes to remote server
git add -A
git commit -m "Commit Message"
git push

Used to checkout branch v2.2.5.x
git checkout v2.2.5.x

Used to checkout master
git checkout master

##Merging branches into the Master branch
Used to Merge branch v2.2.5.x into Master
git checkout master
git merge v2.2.5.x