ns-ui / zipper-stall
Close the merge like a zipper
Drag the handle down the spine. Compatible edits click flush into place as you pass them. Where both branches touched the same spot, the handle jams — pick a side to keep going. The side you didn't take stays in the list, struck through.
merge closure
YoursTheirs
- 14:01 added intro paragraph
- 14:01 renamed section heading
- 14:02 reworded section 214:02 replaced heading
- 14:02 added code sample
- 14:03 fixed typo in title
- 14:03 deleted deprecated note14:03 expanded deprecated note
- 14:04 added changelog entry
- 14:04 reordered imports
- 14:05 bumped version to 2.1.014:05 bumped version to 2.0.9
- 14:05 updated screenshot
- 14:06 closed stale issue link
drag, or arrow keys, down the spine to merge · a stall means pick a side before it can continue
Struck-through rows are edits that were not taken; they stay in the list as a permanent record.