2014-11-04 17:21 GMT+01:00 Phil Hord :
> On Fri, Oct 31, 2014 at 4:40 AM, Alexandre Garnier
> wrote:
>> When merging 2 branches with the same modifications on the both sides,
>> depending the merge side, one branch disappear from the file history.
>>
>> To be more clear, there is a script in atta
On Fri, Oct 31, 2014 at 4:40 AM, Alexandre Garnier wrote:
> When merging 2 branches with the same modifications on the both sides,
> depending the merge side, one branch disappear from the file history.
>
> To be more clear, there is a script in attachment to reproduce, but
> here is the result :
Alexandre Garnier writes:
> When merging 2 branches with the same modifications on the both sides,
> depending the merge side, one branch disappear from the file history.
Isn't this a basic and fundamental of feature of Git called merge
simplification, i.e. if two or more branches did the same t
When merging 2 branches with the same modifications on the both sides,
depending the merge side, one branch disappear from the file history.
To be more clear, there is a script in attachment to reproduce, but
here is the result :
$ git log --graph --oneline --all --decorate --name-status
* 63c80
4 matches
Mail list logo
