#pragma section-numbers 2 <> See InMemoryMergePlan2 = In-Memory Merge = '''Status: Project''' '''Main proponents: Sean Farley (smf)''' /!\ This is a speculative project and does not represent any firm decisions on future behavior. Following up on my previous Google Summer of Code (2013), I plan to finish implementing in-memory merge. This will allow a full merge, in-memory, without needed to change the working directory. The benefits of this are many but most notably is a large speed-up for rebase and the ability to preview a merge. == Goal == Pretty sparse right now. See below for more info. == Detailed description == There are some bumps in the road that will need some thinking. Things such as conflicts, large files, etc. == Roadmap == * {X} abstract context object to handle writing of files (smf has code, see next item) * {X} Un-bitrot smf's old branch * {X} refactor three way merge to use context objects instead of working dir * {X} seriously, refactor three way merge to use context objects instead of working dir * {X} have an experimental option to use in memory merge for rebase (& co), * {X} implement a clean fallback to disk (large files, conflicts, etc.) * {X} turn on memory rebase (& co) on by default, ----- CategoryDeveloper CategoryOldFeatures