Commit workspace changes before merge