committing other (non-source) files before branch-merge