20 Mar
2021
20 Mar
'21
11:37 p.m.
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