Skip to content

Latest commit

 

History

History
49 lines (25 loc) · 2.05 KB

EXAMPLES.md

File metadata and controls

49 lines (25 loc) · 2.05 KB

Merge Examples

Simple Code Motion with a clean Merge

Simple Code Motion with a conflicted Merge

An Edited Section can participate in Code Motion even when another Section Moves Over it.

No Code Motion but differing Splice Points

Simple Code Motion with an Orphan

Complex Code Motion with two Orphans

File Split with an Orphan

File Split with a clean Rename

File Split diverging from Code Motion within a File

File Split causing Orphaned Code Motion within a File

File Join with a clean Rename

File Join with a conflicting Rename