Branching Model

Every feature, or fixing gets a new branch, named like:

• Backend/ParserXy
• Frontend/responsiveSearch
• BugFix/Issue_ID

If you finished your development and testing, push the branch and create a PullRequest. Assign this PullRequest to a collaborator who do testing and CodeReview of your stuff. After an interation while all bugs which might have occured got fixed, the collaborator kann finally test and merge it into the Dev-Branch.

This Dev-Branch gets pulled from our Productive-Server, so everybody is able to test the Dev-Version. If we discover bugs, a new fixing branch have to be opened, with the name of the GitHub-Issue-ID.

From time-to-time, a version gets pulled for the productive site of Newsdiffs into Live-Branch.