> > I'm not sure how to answer all those cases Those were just options that came to my mind how to solve it - practically just one is needed.
> (did I remember a conversation during PharoDays?). > We spoke only very briefly about something else since I didn't use Git at the time yet. > Can you elaborate on a) and the failure? Because I remember looking at the > ability to override conflicts in Metacello by just saying: onConflict: [:ex > | ex allow ] > Yes, onConflict: solves the overriding issue, thanks! Peter
