On 27/04/12 23:03, davidMbrooke wrote:
> On Sun, 2012-04-22 at 17:21 +0300, Andrew wrote:
>> Hi all.
>> I noticed that there are manually applied software updates into both
>> next and 4.2 branch, which will cause merge conflicts in future merging
>> of branches. It'll be not a big trouble, but it'
On Sun, 2012-04-22 at 17:21 +0300, Andrew wrote:
> Hi all.
> I noticed that there are manually applied software updates into both
> next and 4.2 branch, which will cause merge conflicts in future merging
> of branches. It'll be not a big trouble, but it'll be better done by
> usual merge (git me
