On Tue, Sep 5, 2017 at 5:53 PM, Daniel Biran wrote:
>
>>> I'm trying to better understand one of the merge algorithms as I had some
>>> triumphs and tribulations with using a set of commands during a merge.
>>> tldr: can a git merge -s recursive -X patience; // result in a fast-forward
>>> merg
>> I'm trying to better understand one of the merge algorithms as I had some
>> triumphs and tribulations with using a set of commands during a merge. tldr:
>> can a git merge -s recursive -X patience; // result in a fast-forward merge?
>> will --no-ff stop it
>>
>> So, the scenario is this:
>
2 matches
Mail list logo