Xcode merging two git branches

Question

I have two branches, and they are called NewFeature1 and subFun100. subFun100 is a branch created from a previous commit in NewFeature1. Now I have the corrected code in subFun100, and I want to merge again into the NewFeature1 branch. But I have such a conflict. I just want to take both codes and how do I do this? The merge button is hidden and I cannot click. Is there any step that I am missing?

Answer 1

Merge two branches from the apple developer.

3. Eliminate the differences using the left and right buttons to indicate which files should be used.

4. "".

4 . ( )

Git Xcode iOS 7

Answer 2

, , , . .