#pragma section-numbers 2 <> = In-Memory Merge (#2) = '''Status: Project''' '''Main proponents: Phil Cohen (phillco), Sean Farley (smf)''' /!\ This is a speculative project and does not represent any firm decisions on future behavior. Following up on Sean's previous work, we will make in-memory merges work to completion. My main planning document is here: https://paper.dropbox.com/doc/In-Memory-Merge-Plan-gcRIvgBcCton8VlnteTjw and I'll be converting it over to this page. == Goal == * Run in-memory rebases to save on checkout time * Make services able to merge changesets without working copies * Be able to predict if two changesets will conflict * Make a version of rebase that rebases to the furthest possible node towards `dest` that won't create merge conflicts (handy for "pull latest" rebase use cases) == Detailed description == See Paper doc. == Roadmap == See Paper doc. ----- CategoryDeveloper CategoryNewFeatures