On Wed, Aug 17, 2016 at 1:34 PM, Junio C Hamano wrote:
> Robert Dailey writes:
>
>> My use case is that I do a merge from branch A to branch B. Branch A
>> modified a file which is already deleted on B some time before the
>> merge.
>>
>> When I do a
Robert Dailey writes:
> My use case is that I do a merge from branch A to branch B. Branch A
> modified a file which is already deleted on B some time before the
> merge.
>
> When I do a `git status -sb`, these locally deleted but remotely
> modified files show up as
2 matches
Mail list logo