Enum BaseMerge 

pub enum BaseMerge {
    Always,
    OnConflict,
}

When a moved base is merged into a branch that already exists: a continued branch at session open, a resumed session, and the sync a publication runs before it pushes.

Unset on the matched rule and on default:, it is derived from the resolved publication: local-direct merges Always, and every change-request policy merges only OnConflict — a merge nothing asked for restarts every check the host runs on the branch, and the host’s own merge of the change request brings the base in anyway.

Admitted with no version bump, as drafts: was: an older build ignores the key and merges the base as it always did, which is Always.

Variants

Always

Merge the base in whenever it moved, which is what every build before this key did.

OnConflict

Merge the base in only when it conflicts with the branch — so the conflict is resolved before anything is published — or when the host requires a branch to be up to date with its base before it merges. Otherwise the branch stays at its tip and no merge commit is made.

Trait Implementations

impl Clone for BaseMerge

fn clone(&self) -> Self

Returns a duplicate of the value.

fn clone_from(&mut self, source: &Self)

Performs copy-assignment from source.

impl Copy for BaseMerge

impl Debug for BaseMerge

fn fmt(&self, f: &mut Formatter<'_>) -> Result

Formats the value using the given formatter.

impl<'de> Deserialize<'de> for BaseMerge

fn deserialize<__D>(__deserializer: __D) -> Result<Self, __D::Error>

where __D: Deserializer<'de>,

Deserialize this value from the given Serde deserializer.

impl Eq for BaseMerge

impl PartialEq for BaseMerge

fn eq(&self, other: &Self) -> bool

Equality operator ==.

fn ne(&self, other: &Rhs) -> bool

Inequality operator !=.

impl Serialize for BaseMerge

fn serialize<__S>(&self, __serializer: __S) -> Result<__S::Ok, __S::Error>

where __S: Serializer,

Serialize this value into the given Serde serializer.

impl StructuralPartialEq for BaseMerge