To avoid doing a force push create a merge commit with git merge -s recursive -X ours origin/master.
This should allow us to review the changes that happened on master and were not on the SMAPIv3 branch, and double check they didn't get lost.
The only difference vs feature/REQ477/master is the history:
To avoid doing a force push create a merge commit with
git merge -s recursive -X ours origin/master
. This should allow us to review the changes that happened on master and were not on the SMAPIv3 branch, and double check they didn't get lost.The only difference vs
feature/REQ477/master
is the history: