Changes on identical-sides touching crates/oxy-core/src/repo/snapshot.rs · 82
See as swimlanes (independent work side by side)
identical-sides has 65 heads. The graph shows their union; heads are marked.
Marker-like text no longer blocks a conflict resolution
doctor-trustkeyless-tagsv0.5.0v0.5.1v0.6.0v0.7.0
The same file added on both sides, identically, is one file
doctor-trustidentical-sideskeyless-tagsmainpaths-for-resolutions-and-amendpush-notessubrepo-pin-statev0.10.0v0.11.0v0.5.0v0.5.1v0.6.0v0.7.0v0.8.0v0.9.0
head
Log takes the state index's changes in order; a clean diff loads no base
carried-not-removeddoctor-trustidentical-sideskeyless-tagsmainmerge-remote-bookmarkpaths-for-resolutions-and-amendpush-notesshow-statsubrepo-pin-statev0.10.0v0.11.0v0.4.4v0.4.5v0.4.6v0.5.0v0.5.1v0.6.0v0.7.0v0.8.0v0.9.0
head
A binary file's new contents and new executable bit are both kept
bare-hashescarry-identicalonly-help-103switch-saysv0.4.2v0.4.3v0.4.4
First commit: 12 s and 2.1 GB on the Linux tree (refs #41)
agents-in-readmev0.3.0v0.3.1v0.4.0v0.4.1v0.4.2
Walk: tracked paths hidden by ignore rules found by a merge, not a lookup each (refs #41)
agents-in-readmebare-hashescarried-not-removedcarry-identicaldoctor-trustidentical-sideskeyless-tagsmainmerge-remote-bookmarkonly-help-103paths-for-resolutions-and-amendpush-notesshow-statsubrepo-pin-stateswitch-saysv0.10.0v0.11.0v0.2.0v0.3.0v0.3.1v0.4.0v0.4.1v0.4.2v0.4.3v0.4.4v0.4.5v0.4.6v0.5.0v0.5.1v0.6.0v0.7.0v0.8.0v0.9.0
head