Xcode 9.3 Git merge Issue after solving conflict
I'm Pulling some code from a master branch but it contains conflict with my code.
There is only 1 file is in change and only 1 change in it and that contains conflict.
I solve it by selecting "Choose right then left" but "Pull" button is not enabling. It is still disabled.
I also got the same issue yesterday, but I ignored.
Now Today again. This was working fine in Xcode 9.2.
Am I missing something or should I report this bug to Apple?
Here is the screenshot.
Solution
Issue is solved in Xcode 10.1(10B61)
- Xcode 4.4.1 Error Validating Mac app : CFBundleExecutable of two bundles may not point to the same file
- Xcode Build failed,fatal error: module 'firebase_auth' not found @import firebase_auth;
- How to segue when a new programmatically created button is pressed?
- Xcode error: Failed to prepare device for development
- Xcode fails to connect to iPhone
- How do I install a newer swift-tools-version?
- No matching profiles found in Visual Studio after renewing an expiring provisioning profile using Xcode 16
- Showing multiple previews in Xcode 15 and up using Preview Macro
- How to create .ipa file using Xcode?
- XCode no valid compiled storyboard at path
- No such module 'GoogleMaps' found however it is installed
- Permissions not working even though they are in info.plist for Camera & Microphone
- Xcode storyboard view layouts are suddenly broken after a LaunchScreen is added
- error while build iOS app in Xcode : Sandbox: rsync.samba (13105) deny(1) file-write-create, Flutter failed to write to a file
- The SwiftUI sheet view modifier in the code below doesn't launch on LongPress. Xcode 16.2
- How can I include <bits/stdc++> in Xcode
- Provisioning profile doesn't include the com.apple.developer.arkit.main-camera-access.allow entitlement
- @StateObject vs @ObservedObject when passed externally but owned by the view
- Metal Texture with Overlay comes in Green
- 'InfoKey' is not a member type of 'UIImagePickerController'
- ILLINK error MT2301: The linker step 'Setup' failed when compiling a MAUI app for iOS
- 'RCTAppDelegate.h' file not found
- How to add a Sandbox account along with a regular AppleId?
- Where does Xcode store ssh fingerprints of hosts?
- Launch iOS simulator from Xcode and getting a black screen, followed by Xcode hanging and unable to stop tasks
- Sandbox: bash(2538) deny(1) file-read-data /Users/.../ios/App/Pods/Target Support Files/Pods-App/Pods-App-frameworks.sh
- No such module 'UIKit'
- The archive did not include a dSYM for the Flutter.framework with the UUIDs
- Change size (height) of ProgressView in SwiftUI
- Xcode Widget Extension Cannot Preview in WatchOS