# Standard between services # Git When merging feature branch to develop, commits should be squashed and the commit name should state what changed. Example: ```markdown #306 Guard against applying fields when they already exist ``` Where #306 is the issue number. When merging develop branch to master, commits should be squashed and merge request content should be list of all features added. Example: ```markdown #212 Show latest commit hash and timestamp in popup footer #56 Format submission count under exercise view #302 Seed new charons under a selected course and section with selected preset with grade generation #255 Add calculation for average test result and show amount of undefended students #327 Don't make artifacts when not in master #325 Defense registration confirmation before deleting student defense #201 Modal closes with ESC #288 'Go to submission' is replaced with charon name #333 Logging format with an example ``` # Logging (WIP) Logs should be sent to Logstash. Service should send access logs there as well. Logs should be in a json format.