checked out feature_y, created a file, git add *, now commit