|
At this moment the main branch represents 'coal' quality code.
If you create a branch yourself, please adhere to the following convention.
- Give it a meaningful name. If you are working on an entire package, use the short name of that package (e.g. collections for org.jutil.java.collections).
- Append a sequence number to the name : 1,2,...
- If your create a sub-branch, use a hierarchical name: nameOfBranch_nameOfSubBranch. E.g. event1_collections1. This way it is easy to understand what is done in the branch. In this case, you can derive that the main purpose is to work on events, and that in that branch, for some reason a subbranch was created to do some work on the collections.
- After every merge of a branch with its "superbranch", the branch is dead. If other work needs to be done on the same subject, create a new branch with the same name, but an incremented sequence number. E.g. after merging event1_collections1 with event1, I want to do more work on the collections because I need it in events1. Then I create a new branch event1_collections2. This avoids lots of merging, and thus reduces the chance of conflicts and inconsistencies.
|
