Continuous Integration Process

[DanVanAtta]

I'd like us to agree on a continuous integration process and to document it on the github wiki.

Definition: continuous integration means the work of multiple developers is integrated together on a short iteration cycle. Meaning, merge conflicts that come up are small and not so frequent.

Proposal: simply use master branch for integration. Pull requests will add new code, "git pull --rebase" to pull down remote code and integrate it locally.

[ron-murhammer]

Yep. Everyone should fork the repo and submit pull requests for Veqyrn and I to review for now.

[ron-murhammer]

I'll add one more important point which is please make small commits that are properly commented. Its much easier to review small commits that make it obvious what they are doing rather than huge commits that make lots of changes. It also allows us to accept changes at a finer grain rather than having to reject a large commit because of an issue with a small part of it.

This is especially important since there are only 2 of us reviewing pull requests right now and Veqryn has been pretty busy recently.

[DanVanAtta]

@ron-murhammer I want to avoid confusion and be clear on what this process would look like (I think there is some confusion since forks are not so pertinent):

• all the time there are pull requests going into triplea/master, and developers pull from it in order to integrate. Periodically a release branch is cut, tested in more detail, bug fixes are applied to it + master, and a release happens. That branch is "thrown away" and the process repeats.

Continuous integration means integrating often, my intent here is to designate master/triplea as the integration branch. This means dev's push there often and pull from there so that they integrate often.

[DanVanAtta]

Closing, at some point maybe later today I'll try to document this on the wiki. The integration+release process I think should be documented somewhere, probably there.