This is the official Git repository for common components used/shared by the various Overlord sub-projects.
The easiest way to get started with the code is to create your own fork of this repository, and then clone your fork:
$ git clone email@example.com:<you>/overlord-commons.git $ cd overlord-commons $ git remote add upstream git://github.com/Governance/overlord-commons.git
At any time, you can pull changes from the upstream and merge them onto your master:
$ git checkout master # switches to the 'master' branch $ git pull upstream master # fetches all 'upstream' changes and merges 'upstream/master' onto your 'master' branch $ git push origin # pushes all the updates to your fork, which should be in-sync with 'upstream'
The general idea is to keep your 'master' branch in-sync with the 'upstream/master'.
We use Maven 3.x to build our software. The following command compiles all the code, installs the JARs into your local Maven repository, and runs all of the unit tests:
$ mvn clean install
Overlord Commons is open source, and we welcome anybody who wants to participate and contribute!
If you want to fix a bug or make any changes, please log an issue in the Overlord Commons JIRA describing the bug or new feature. Then we highly recommend making the changes on a topic branch named with the JIRA issue number. For example, this command creates a branch for the SOAG-1234 issue:
$ git checkout -b soag-1234
After you're happy with your changes and a full build (with unit tests) runs successfully, commit your changes on your topic branch (using really good comments). Then it's time to check for and pull any recent changes that were made in the official repository:
$ git checkout master # switches to the 'master' branch $ git pull upstream master # fetches all 'upstream' changes and merges 'upstream/master' onto your 'master' branch $ git checkout soag-1234 # switches to your topic branch $ git rebase master # reapplies your changes on top of the latest in master (i.e., the latest from master will be the new base for your changes)
If the pull grabbed a lot of changes, you should rerun your build to make sure your changes are still good.
You can then either create patches (one file per commit, saved in
$ git format-patch -M -o ~/soag-1234 orgin/master
and upload them to the JIRA issue, or you can push your topic branch and its changes into your public fork repository
$ git push origin soag-1234 # pushes your topic branch into your public fork of Overlord Commons
and generate a pull-request for your changes.
We prefer pull-requests, because we can review the proposed changes, comment on them, discuss them with you, and likely merge the changes right into the official repository.