yade-dev team mailing list archive

[Janek Kozicki <janek_listy@xxxxx>]

Jerome Duriez said:     (by the date of Tue, 8 Jan 2019 18:51:26 +0100)

> Yes, I actually meant the branches a single dev has to deal with, for 
> his modifications to finally be included into the code ;-)
> (it's true however experimental would not be one of those if it's just 
> to make experiments..)

Please have a look at that
https://hackernoon.com/fix-conflicts-only-once-with-git-rerere-7d116b2cec67
which I explained a bit in my other post :)

The other important question which you raised I will discuss in my other post.

-- 
Janek Kozicki