[Phpmyadmin-devel] branches

Marc Delisle marc at infomarc.info
Fri Jul 15 20:12:16 CEST 2011

Le 2011-07-15 14:05, Rouslan Placella a écrit :

>>>> And this one would make an interesting merge conflict :D
>>> You forgot to merge QA_3_4 back into master after applying the fixes,
>>> which I guess you didn't actually cherry-pick due to the differences in
>>> whitespace distribution, so it left some interesting conflicts for the
>>> next person merging QA_3_4 into master...
>> Oops, sorry. Fortunately the correct way to resolve them was to use
>> the file from master.
> Then oops me too, because during the merge I used the hunks of code from
> QA_3_4 when resolving conflicts. It made sense to me at the time to keep
> the code from the two branches as similar to each other as possible...

The more we progress in 3.5 development, the more we'll see code
differences and it will be easier to fix non-urgent bugs only in master.

Marc Delisle

More information about the Developers mailing list