Undoing changes that were intended in a branch