Hi Ernesto, > As soon as you cherry-pick and there are conflicts, the git > cherry-picking will inform you about how to finalize it after solving. Indeed. I need to learn reading ;-) Thanks for the detailed scenario. Cheers -- Francois Suter Cobweb Development Sarl - http://www.cobweb.ch