Committing old code before branch merging for project overhaul