Source Control merge button grayed out?

Question

At my workplace we have set up GIT source control. We made a new branch off of the master and altered pretty much all of the code in a few modules.

When we came to merge it the merge button in the source comparison window was greyed out?

We had already made some changes in that branch and merged them, so would that stop us making other changers and merging the branch again?

We're all pretty confused by this and kind of hoping somebody knows ANY reason why the merge button may be greyed out and we can see if that applies?

Answer 1

Make sure to check the "File View" in the upper-left hand corner for more files that may have conflicts.

The default place you're looking at for resolving merge issues is the "Project View", which contains all project files. But especially if you are merging from/into another branch, there may be other more hidden (non-code) files that have been changed.

So switch to the "File View" to check for conflicts there as well. (it's located in the upper-left hand corner of the merge resolving screen)

Answer 2

I've experienced a similar issue after creating a branch and then attempting to 'merge branch into' the master.

In the window with the greyed out merge button I found if you deselect the blue highlighted branch to merge into (in my case 'master') by clicking in the space below, then select it again the merge button becomes available.

I know this doesn't answer why it's happening but as least merging can be used inside xcode again.