[bug][beta] Merging Two Branches when changing the folder name

Continuing the discussion from Merge changes into master error:

The response in in this post was the solution. Changing a folder name in a branch results in an error when trying to pull updates from the master.