pub enum MergeStrategy {
MergeCommit,
FastForward,
}Expand description
How a fan-out merges back into main.
Variants§
MergeCommit
git merge --no-ff — a merge commit on main with main’s tip and the
wip tip as parents. Preserves the wip branch’s per-changeset commits
(no squash). The default.
FastForward
Advance main’s ref directly to the wip tip — fails if main has moved
since the fan-out began (would create a fork; use MergeCommit then).
Trait Implementations§
Source§impl Clone for MergeStrategy
impl Clone for MergeStrategy
Source§fn clone(&self) -> MergeStrategy
fn clone(&self) -> MergeStrategy
Returns a duplicate of the value. Read more
1.0.0 (const: unstable) · Source§fn clone_from(&mut self, source: &Self)
fn clone_from(&mut self, source: &Self)
Performs copy-assignment from
source. Read moreimpl Copy for MergeStrategy
Auto Trait Implementations§
impl Freeze for MergeStrategy
impl RefUnwindSafe for MergeStrategy
impl Send for MergeStrategy
impl Sync for MergeStrategy
impl Unpin for MergeStrategy
impl UnsafeUnpin for MergeStrategy
impl UnwindSafe for MergeStrategy
Blanket Implementations§
Source§impl<T> BorrowMut<T> for Twhere
T: ?Sized,
impl<T> BorrowMut<T> for Twhere
T: ?Sized,
Source§fn borrow_mut(&mut self) -> &mut T
fn borrow_mut(&mut self) -> &mut T
Mutably borrows from an owned value. Read more