Committing code which will then be merged into master (more or less)