The tests in the PR seem to assume that: 1. HEAD comes first, which is not true for many Git workflows 2. That the conflict happens in separate packages
It seems there has not been a discussion of all the possible corner cases. Further thoughts? *José Valim* www.plataformatec.com.br Skype: jv.ptec Founder and Director of R&D On Fri, Sep 8, 2017 at 4:38 AM, Allen Madsen <[email protected]> wrote: > I haven't looked too much myself, but this is the PR that added it. > https://github.com/yarnpkg/yarn/pull/3544/files > > Allen Madsen > http://www.allenmadsen.com > > On Thu, Sep 7, 2017 at 9:05 PM, José Valim <[email protected]. > br> wrote: > >> That's an interesting feature. Does anyone have more information on how >> the merging actually works? Depending if you are rebasing or merging the >> direction on Git changes so it seems we can't simply pick what comes first >> or what comes later, can we? >> -- >> >> >> *José Valim* >> www.plataformatec.com.br >> Skype: jv.ptec >> Founder and Director of R&D >> >> -- >> You received this message because you are subscribed to the Google Groups >> "elixir-lang-core" group. >> To unsubscribe from this group and stop receiving emails from it, send an >> email to [email protected]. >> To view this discussion on the web visit https://groups.google.com/d/ms >> gid/elixir-lang-core/CAGnRm4K7LCpnBqCh4f8L_TBmWEqh_6G575h3- >> L24AYRzfB6SKg%40mail.gmail.com >> <https://groups.google.com/d/msgid/elixir-lang-core/CAGnRm4K7LCpnBqCh4f8L_TBmWEqh_6G575h3-L24AYRzfB6SKg%40mail.gmail.com?utm_medium=email&utm_source=footer> >> . >> >> For more options, visit https://groups.google.com/d/optout. >> > > -- > You received this message because you are subscribed to the Google Groups > "elixir-lang-core" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to [email protected]. > To view this discussion on the web visit https://groups.google.com/d/ > msgid/elixir-lang-core/CAK-y3CsJ1NPpYYbHHPZvpoWDgOg% > 3DibtrGxb3b3%3DQ9R5E_6sGNQ%40mail.gmail.com > <https://groups.google.com/d/msgid/elixir-lang-core/CAK-y3CsJ1NPpYYbHHPZvpoWDgOg%3DibtrGxb3b3%3DQ9R5E_6sGNQ%40mail.gmail.com?utm_medium=email&utm_source=footer> > . > For more options, visit https://groups.google.com/d/optout. > -- You received this message because you are subscribed to the Google Groups "elixir-lang-core" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/elixir-lang-core/CAGnRm4LwWgmWB_CwqOrib0RvaRVMy75EEuhQD8Rvot-NBkvZcQ%40mail.gmail.com. For more options, visit https://groups.google.com/d/optout.
