[Development] [IMPORTANT] your commits in stable branch perhaps lost after dev branch merged

[Eskil Abrahamsen Blomfeldt]

On 03/21/2013 05:12 PM, Qi Liang wrote:
>> Let's be more clear: no commits were lost. They are all still present.
>>
>> However, due to conflicts, some changes may have been improperly resolved. This
>> is no different than any other merge, in any direction.
> Yes, it's "lost" because of conflict resolve. And we recorded the conflicts information in merge commit, that's better than before, the merge commits in Qt 4.

This is also a good reason to make an effort to add unit tests that 
verify your fix, however banal they might be, because there's a much 
smaller chance that the unit test will disappear in the merge than the 
bug fix.

-- Eskil