Merging pull request is not working
Hi, I have a repository with 2 branches called master -> dev-master.
I am using the master branch for production, basically, I do development by creating the new-branch from the dev-master branch
git checkout dev-master
git pull origin dev-master
git checkout -b new-branch
commit files and push to the branch
git push origin new-branch
after that will raise PR and merge the codes to the dev-master branch.
If any hotfixes need to be done in the production, I will create a new branch from master and merge it to master. So the same changes need to be merged with the dev-master branch since development work is on that dev-master branch.
I have created the sync/master-to-development from the dev-master and pull the changes from the master branch, cleared the conflicts and pushed it to a sync/master-to-development.
git checkout dev-master
git pull origin dev-master
git checkout -b sync/master-to-development
git pull origin master
cleared the conflicts and commit the changes
git push origin sync/master-to-development
I have raised the pull request and the merge is not working when I clicked the merge button in the PR. The loader keeps on loading as below the screenshot
