Steve, Am 20.03.21 um 16:37 schrieb Stephen Casner:
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 didn't trace that down, was kind of expected as you rebased the branch. My local branch contained your old commits, which conflicted with two of the new files. If a published branch gets rebased, it's normally best to reset/recreate local branches based on that branch. A fast forward may be possible if the rebase was trivial, but normally isn't.
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? Assuming no objections from other developers, I would first merge mongoose-wolfssl into master, then master into for-v3.3.
Regards, Michael -- Michael Balzer * Helkenberger Weg 9 * D-58256 Ennepetal Fon 02333 / 833 5735 * Handy 0176 / 206 989 26