NoMAD uses a simple two branch structure. Combined with a feature branch workflow changes are encapsulated and easy to merge. At the same time all code changes are documented by the workflow.
The basic branches are:
- This is the branch that only ever holds finished release code
- The development branch. (This branch should always build clean!)
Feature Branch Workflow
Using feature branches in git is very easy.
- Open a ticket that describes the changes to be made to the code.
- Pull to update your local copy of Experimental, then make a new branch with the naming syntax of Username-Issue-Description.
- Edit code in the feature branch, committing and pushing like normal.
- When you are satisfied with your changes, submit a merge request that references the issue ticket. (Gitlab makes this easy to do with issue number auto-complete.)
Opening a merge request Filling in merge request info 5. Once the request is accepted, update the ticket with the git commit that the changes landed in if Gitlab didn’t associate them automatically. 6. Delete the feature branch if it wasn’t automated in the merge accept.