On Thu, Feb 22, 2024 at 10:35 AM Phillip Wood <phillip.wood123@xxxxxxxxx> wrote: > Well spotted, do we really need a new test file just for this though? I > wonder if the new test would be better off living in > t3505-cherry-pick-empty.sh or t3507-cherry-pick-conflict.sh I was modelling this off of 't3422-rebase-incompatible-options.sh'. Additionally, I do feel like these tests are only tangentially related to the tests that actually exercise the features themselves. Notably, the setup requirements are drastically different (simpler) since the test should fail long before any setup actually matters. For that reason, I think a separate file where other future tests for incompatible options can also live does make sense. Is there any particular downside to the new file that I am unaware of? -- Thank you, Brian Lyles
