Hi Junio, On Tue, 27 Aug 2019, Junio C Hamano wrote:
> My plan is to have ew/hashmap topic for a few days while ejecting > the js/add-i topic which semantically conflicts with the changed way > hashmaps ought to be used temporarily, and when I have enough time > and concentration, try to see if I can come up with a good semantic > conflict resolution that I can keep reusing (aka refs/merge-fix/). > If it happens, we'll see both topics, and if it doesn't, I'll then > drop ew/hashmap and queue js/add-i and rinse and repeat from there > ;-) FWIW I crafted my latest iteration such that you would only need to do the `hash` => `_hash` rename in one line to merge `js/builtin-add-i`. Ciao, Dscho
