[Phpmyadmin-devel] QA_3_5 merge
marc at infomarc.info
Wed Aug 22 16:26:06 CEST 2012
Marc Delisle a écrit :
> Michal Čihař a écrit :
>> please try to merge every change done in QA_3_5 into master so that
>> future changes can be merged easier. Today I was unable to do merge
>> because these commits (second one is just a fix for first one) do not
>> apply at all.
>> In case the changes should not be merge at all, just do:
>> git checkout master
>> git merge -s ours origin/QA_3_5
>> This will tell git that it should not care about extra commits in
>> QA_3_5 anymore.
>> So master is now missing following commits and I have no clue if there
>> is something needed there or not:
> Yes, these commits are needed in master.
Fix ported to master.
More information about the Developers