pub struct MergedPath {
pub path: Vec<u8>,
pub stages: MergeStages,
pub result: Option<(u32, ObjectId)>,
pub worktree: Option<(u32, Vec<u8>)>,
pub conflict: Option<MergeConflictKind>,
pub auto_merged: bool,
}Expand description
One resolved/conflicted path in the merged tree.
Fields§
§path: Vec<u8>Destination path in the merged tree.
stages: MergeStagesThe per-stage (1=base, 2=ours, 3=theirs) entries when conflicted; all
None for a clean resolution.
result: Option<(u32, ObjectId)>Some((mode, oid)) is the final leaf written to the merged tree; None
means the path is absent in the result (a clean delete).
worktree: Option<(u32, Vec<u8>)>When conflicted, the worktree bytes + mode to materialize (content with
conflict markers, or the surviving side’s bytes). None for a clean
path.
conflict: Option<MergeConflictKind>Some(..) exactly when this path conflicted.
auto_merged: boolTrue when this path went through a textual 3-way content merge (both
sides diverged and both were mergeable files). Drives the “Auto-merging
git merge-tree emits for every
such path — clean or conflicted.
Implementations§
Trait Implementations§
Source§impl Clone for MergedPath
impl Clone for MergedPath
Source§fn clone(&self) -> MergedPath
fn clone(&self) -> MergedPath
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 moreAuto Trait Implementations§
impl Freeze for MergedPath
impl RefUnwindSafe for MergedPath
impl Send for MergedPath
impl Sync for MergedPath
impl Unpin for MergedPath
impl UnsafeUnpin for MergedPath
impl UnwindSafe for MergedPath
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