Revert changes intended for a feature branch