We must select best way doing this. We need at first check that all Ubuntu specified changes are still valid and compatible with upstream, otherwise we need adjust and update those Ubuntu changes before doing merge.
We must select best way doing this. We need at first check that all Ubuntu specified changes are still valid and compatible with upstream, otherwise we need adjust and update those Ubuntu changes before doing merge.