finworks/smallsource — Issue #6: merge in smalltalk
Author: ottobehrens
Created: 2012-01-29 22:44:30+00:00
State: open

Essentially, the 3 way merge does not work. I can't exactly remember why now. One thing is that it has to do with the version file. You can't ditch the ancestry and expect the image to magically know what to merge in. Secondly, there is no previous snapshot of the package (that has to be merged in) on the file system. The file system only has one version of the file at a given point in time. So, to do a 3 way merge, we will have to identify the commit that has to be merged in, and check it out on the file system at the point where the correct ancestor is cached / loaded. Something like that.