On Sun, Nov 30, 2014 at 4:19 AM, kilon alios <kilon.alios@gmail.com> wrote:

"The important take-away from this is that when working with git and Smalltalk you must track the SHA that has been loaded into the image (the latest version of Metacello tracks this information in the project registry) and you must have in-image tool support for recognizing SHA skew. It's not absolutely necessary to provide a tool for `skew save`, but it _is_ tedious to "merge your way out of trouble" manually and in-image tools make this situation much more tolerable ..."

well I have to confess all this is way out of my league :D��

Haha ... and that's the point ... with tool support you don't have to be "in that league":)

As I said before I have done some merges with git, but nothing so complex to require knowing all this stuff. But then I work mostly on my own small projects and not in large teams.��

FWIW, I was getting myself into this trouble, by working in multiple images that were distributed over time ... I would come back to an older image and discover that I'd updated one of my shared projects and I had modifications to that project that I wanted to save ...��

Tools are supposed to help people who do not have a PHD in git and not get in the way of those who do:)

Dale