Re: [PATCH v2 3/7] checkout: move 'confict_style' to checkout_opts
- From
Stefan Beller <sbeller@google.com>
- Date
- Nov 27, 2018, 19:50 UTC
- Message-ID
- <CAGZ79ka5bYyz4nyzUFqwNzwDpkt6n6vCr-kEbG9xwJmcJyXsPg@mail.gmail.com>
- In-Reply-To
- <20181127165211.24763-4-pclouds@gmail.com>
On Tue, Nov 27, 2018 at 8:53 AM Nguyễn Thái Ngọc Duy <pclouds@gmail.com> wrote:
>
The last patches seemed self explanatory after the first RFC and their commit message. This one is harder to reason about, as --conflict is documented as "The same as --merge option above, but ..." and --merge is "When switching branches, ..." so ... ah my mind wandered off, expecting this to be a preparation for the separate commands already, but this is just about ensuring everything is in opts such that the split can be done later?