Here’s my scenario, we just upgraded from BizTalk 2016 (uses Visual Studio 2015) to 2020 (uses Visual Studio 2019). I’m the only developer and I have two sets of code on two different virtual machines representing those two different environments.

1. Master branch is BizTalk 2016 and I have some uncommitted changes
2. I have a BT2020 branch for the new changes.

There will be a few conflicting changes in between the two.

What I would like to do is:

1. Commit/Push 2016 changes to master
2. Put a tag on the master for the last code for BT2016
3. Commit/Push code changes to 2020 branch
4. Merge the 2020 branch to master without any merge conflicts – just tell it to take the 2020 branch as being the new correct code version.
5. Tag that as the first code for BT2020.

Does that sound like the best plan of action?
How do I do the merge in step 4 and force the BT2020 branch to be become the master without having to cherry pick and manually merge any differences? We are using Azure based Git repository.