casner at acm.org
Sun Mar 21 23:11:32 HKT 2021
On Sun, 21 Mar 2021, Michael Balzer wrote:
> It seems you actually cherry-picked all commits? If so, a standard merge would
> have had the same effect (except tree-wise).
All but one. The one I skipped changed the mongoose submodule to
> Cherry-picking is useful if you want to port some selected patch(es) from a
> branch to another. If you take the whole branch, that's the classic merge.
Right. I tried that first, and it went smoothly, but then I backed it
out to do the cherry-pick.
More information about the OvmsDev