[Ovmsdev] mongoose-wolfssl
Stephen Casner
casner at acm.org
Sat Mar 20 23:37:09 HKT 2021
Michael,
> Sorry, been busy. Git didn't pull the updated branch now without a conflict,
> so I simply reset my local branch to your latest version.
Why was there a conflict? Should I have done something differently?
> I suggest taking this into edge as soon as possible.
What would be the best merging strategy considering that it needs to
go to both master and for-v3.3?
-- Steve
More information about the OvmsDev
mailing list