[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
Re: [PATCH] Code syncronization
1. What is this? Generally, I don't want to see multiple
functionalities/multiple fixes in one patch, it makes it
difficult to read.
2. See little note below
Sergey wrote:
> From: Sergey Jukov <sergey@total-knowledge.com>
>
> +>>>>>>> baa6296b87cb9d760e7998650c3490248ab6c79e/ChangeLog
>
This looks like there was a conflict, which you failed to resolve.
--
Ilya A. Volynets-Evenbakh
Total Knowledge. CTO
http://www.total-knowledge.com