I am new to Unity, so this might be the reason. I’m working in Windows 11.
I have a main branch and asked a developer to do some work in a feature branch, which they created. I reviewed the branch, but I did not have the merge option enabled in the dropdown to bring the feature into the main branch.
I made myself the owner of the feature branch, but still no merge option. I then gave all permissions to all users to the main branch and the feature branch. Still no merge option. I updated the Version Control Tool - restarted. Still no merge option.
I then explored the issue through the Unity online account via the DevOps service (same login I am using for the Version Control Tool). From here, I was able to perform a merge.
Anyone know why I can’t perform a merge in the Version Control Tool please?
I found the problem. Make sure you don’t have any pending changes before you want to merge. Unity should add a tooltip over the grayed-out merge options indicating this.
Thank you, but I’m not sure it is pending changes. The Version Control tool never enables the merge option, but merge is always available in the DevOps tool. I’m sticking with the DevOps tool for now as I have spent too much time on this already.
Thanks for reaching out to the Unity forums. Based on the issue you’re describing, it seems like an isolated case if it’s not related to the permissions, the pending changes or lock operations.
