I created a branch on master, and then I wanted to merge it into develop, but I found that it couldn't be merged. Normally, right-click the branch, merge into the current branch, and then click push to merge it, but I did this, and I found no merge up
