[squeak-dev] Monticello merge - what does Keep/Reject mean again?

tim Rowledge tim at rowledge.org
Sun Jan 24 22:59:45 UTC 2016


There’s an alternative way of handling this kind of issue and we even have a tool that sort of does it. Consider the Dual change sorter where one can move changes from one changeset to another by class, or by individual method and possibly other ways I don’t recall.

Perhaps the list of conflicts in a merge could be better displayed with a list of conflicts on the left, an originally empty list on the right and buttons/drag/menu options to move them to the ‘accept into my life’ list on the right. This would provide a very clear indication of what is going to be loaded, with plenty of time to change one’s mind if needed. I used something like this in the VMMakerTool for similar reasons.

I’d also like to urge some thought about what to do with methods where one already has a change but wants some of the incoming change too; an option to edit & add-to-load would be nice. Perhaps something relatively simple like adding the chosen method to a method browser just for those cases, with a nice label saying ‘deal with in a moment’? 

tim
--
tim Rowledge; tim at rowledge.org; http://www.rowledge.org/tim
Strange OpCodes: NBR: Unconditional No BRanch




More information about the Squeak-dev mailing list