yes I am aware of git documentation thus I mention it in my video tutorial On Wed, Dec 3, 2014 at 2:26 PM, Ben Coman <[email protected]> wrote:
> kilon alios wrote: > >> I dont disagree but when it comes to me making a tutorial about something >> then foremost I want to know exactly what I am talking about. So its >> pointless for me to talk about merges using filetree and gitfiletree unless >> I understand these specific topic inside out. >> I dont have a problem getting a phd, I am a bookworm by nature anyway and >> I love learning. I am not saying also that tools are not needed to make >> things easier, obviously if tools make life easier then I am all for using >> them. But I need to make sure first that the tools you guys make work well >> in practice to recommend them to my viewers. Thats how serious teaching >> works. So I think for now would be better if I get more experience with >> merges as Thierry said and study more the internals of git. >> > > You may have seen this already... > http://git-scm.com/book/en/v1/Git-Internals > > > So far all I knew that using git for binary files was a no go, doable but >> not recommended. Thus I found strange that filetree uses binary files. >> On Sun, Nov 30, 2014 at 5:20 PM, Dale Henrichs < >> [email protected] <mailto:[email protected]>> >> wrote: >> >> >> >> On Sun, Nov 30, 2014 at 4:19 AM, kilon alios <[email protected] >> <mailto:[email protected]>> 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 >> >> >> > >
