On Tue, Jul 10, 2018 at 8:53 AM, Stefan Beller wrote:
> On Tue, Jul 10, 2018 at 8:28 AM Elijah Newren wrote:
>> 2) I didn't just check what was currently failing but other things
>> that should be true for this test.
>>
>> For item 2, I've had multiple cases in the past where I created a
>> mini
On Tue, Jul 10, 2018 at 8:28 AM Elijah Newren wrote:
>
> On Mon, Jul 9, 2018 at 2:11 PM, Stefan Beller wrote:
> > On Sat, Jul 7, 2018 at 1:44 PM Elijah Newren wrote:
> >>
> >> In the case of a file/submodule conflict, although both cannot exist at
> >> the same path, we expect both to be present
On Mon, Jul 9, 2018 at 2:11 PM, Stefan Beller wrote:
> On Sat, Jul 7, 2018 at 1:44 PM Elijah Newren wrote:
>>
>> In the case of a file/submodule conflict, although both cannot exist at
>> the same path, we expect both to be present somewhere for the user to be
>> able to resolve the conflict with
On Sat, Jul 7, 2018 at 1:44 PM Elijah Newren wrote:
>
> In the case of a file/submodule conflict, although both cannot exist at
> the same path, we expect both to be present somewhere for the user to be
> able to resolve the conflict with. Add a testcase for this.
>
> Signed-off-by: Elijah Newren
In the case of a file/submodule conflict, although both cannot exist at
the same path, we expect both to be present somewhere for the user to be
able to resolve the conflict with. Add a testcase for this.
Signed-off-by: Elijah Newren
---
t/t7405-submodule-merge.sh | 56 +
5 matches
Mail list logo
