CODEWITHSUNDEEP
xcodegitmerge-conflict-resolution
Khant Thu Linn
Khant Thu Linn

Reputation: 6143

Xcode merge two branch Git

I have two branch and they are called as NewFeature1 and subFun100. subFun100 is a branch created from previous commit in NewFeature1. Now, I have fixed code in subFun100 and I want to merge back into NewFeature1 branch. But, I have conflict like this. I just want to take both codes and how shall I do? Merge button is hidden and I can't click. Is there any step I am missing?

enter image description here

Upvotes: 4

Views: 7643

Answers (2)

Warif Akhand Rishi
Warif Akhand Rishi

Reputation: 24248

Merging Two Branches from developer apple.

3 . Resolve differences by using the left and right buttons to specify which file’s contents to use.

4 . After resolving all differences and conflicts, click Merge.

enter image description here

Use these 4 buttons. (red circle)

How To Use Git Source Control with Xcode in iOS 7

Upvotes: 3

Gabriele Petronella
Gabriele Petronella

Reputation: 108169

You need to resolve each conflict, choosing either left, right or both. Only then you can complete the merge.

Upvotes: 1

Related Questions