I just did a plain git merge, since I actually wanted both branches to join.
Nicolas
Le 28 oct. 2014 à 23:30, Jean-Louis Boudart a
écrit :
> Can you tell us the command you use ?
>
> Did you used squash option? Did you rebase ?
>
> 2014-10-28 22:55 GMT+01:00 Nicolas Lalevée :
>
>> As you ca
Can you tell us the command you use ?
Did you used squash option? Did you rebase ?
2014-10-28 22:55 GMT+01:00 Nicolas Lalevée :
> As you can see on the notifications list, there is a nice bunch of mails,
> all generated from my one commit which merged the master of Ivy into the
> branch 2.4. I h
As you can see on the notifications list, there is a nice bunch of mails, all
generated from my one commit which merged the master of Ivy into the branch
2.4. I have hard time understand the rationale. Anyone more familiar with git
than me have some explanation ?
Note that I am not worried, I j