When preparing your work for a deployment / release you may encounter the error message. "This branch is being master, you cannot merge in if you are behind" or "This branch is being main, you cannot merge in if you are behind". This is MDOQs way of warning you that there are changes in the main/master branch (i.e on production) that aren't on your instance.
MDOQ warns you, and stops you from proceeding because we always want to include everything from production, otherwise there is a chance you are testing work on your instance that isn't compatible to live.
The solution here is very quick and simple. We simply need to merge master/main back into your instance, to ensure we have all the work that is on production in your instance. To do this:
- Close the "I'm Done" dialog if still open
- Select your instance
- Select "Github"
- Select the target branch from the drop down. (This will likely be "master" or "main")
- Click "Merge" (This will merge the selected branch into your current branch)
- Once complete click "Git Pull" this will pull the remote changes to your branch, to your instance
You can then continue with the "I'm Done" process as normal