Tag: xcode

Xcode git Auto-Detect Email Error

With Xcode 7, I’m having a problem committing code to git. I get this error: *** Please tell me who you are. Run git config –global user.email “you@example.com” git config –global user.name “Your Name” to set your account’s default identity. Omit –global to set the identity only in this repository. fatal: unable to auto-detect email […]

XCode does not find Swift bridging header file in some files

I do have a problem in my iOs application with XCode. It has been coded in Objective-C, and now I am working on migrating files in Swift, one after another. The code is shared between team members with a versioning system (git). I started with the core classes and I proceed like this : I […]

Xcode 5 – How to use source control with a workspace

I’ve created myself a Xcode 5 workspace and added 2 projects into it. The first project is a Mac OS X Cocoa Application and the second is an External Build System. When creating the projects I checked the option so it would create a git repository for each. Then, I’ve tried looking at the menu […]

xCode 4.5 git merge fails to commit or give errors

I have two branches that I am trying to merge in xCode 4.5. After I resolve the two conflicting files and press the “Merge” button, the merge screen disappears, no errors come up, and it looks like it is successful. But unlike my previous experience with xCode 4.4, nothing is actually committed. If I try […]

Issues with git branch checkout due to untracked working tree files

I thought I put the days of Xcode + git issues behind me. Guess not. I am getting this git error when trying to checkout another branch. error: The following untracked working tree files would be overwritten by checkout: RCAlpha.xcodeproj/project.xcworkspace/xcuserdata/andrewjl.xcuserdatad/UserInterfaceState.xcuserstate RCAlpha.xcodeproj/xcuserdata/andrewjl.xcuserdatad/xcschemes/RCAlpha.xcscheme RCAlpha.xcodeproj/xcuserdata/andrewjl.xcuserdatad/xcschemes/xcschememanagement.plist Please move or remove them before you can switch branches. Aborting Very well […]

Git Merging of Binary Files (in particular Xcode project files)

I’ve got an Xcode project under git and I’ve got a “experimental” branch off of my “master” branch. Both branches have diverged since the branch (so no fast-forwarding!), and I am merging “experimental” into my “master” branch. I’ve setup a .gitattributes file to treat a particular Xcode file (project.pbxproj) as binary, as it should be […]

Is there support for git rebasing in Xcode?

Can one rebase to integrate changes from one branch to another from within Xcode? I know Xcode supports merge but I couldn’t find anything for rebasing.

Disable osxkeychain credential helper in git as installed by Xcode

I need to disable the git credential helper for OS X: git-credential-osxkeychain I’m using git as installed by Xcode Command Line Utilities 4.6.2 in OS X Mountain Lion 10.8.3. In this installation the default behavior of git pull or git push is for the password to be remembered, thereby freeing the user from having to […]

git ignore for directories with spaces on Mac OS X

I’m trying to add some patterns to my .gitignore file to ignore *.mode1v3 and *.pbxuser files generated by Xcode. However, my app name has a space in it, so the files I want to ignore are in the Foo Bar.xcodeproj/ directory. Adding variants of these patterns don’t seem to work: *.mode1v3 Foo Bar.xcodeproj/ Foo Bar.xcodeproj/*.mode1v3 […]

How to use Github with Xcode4's version control

The whole implementations seems very unstable. Sometimes I can push, sometimes it fails with ‘no permission’. Cloning through Xcode’s Organizer behaves even stranger: The first time, it fails with no permission. When I click ‘try again’, it fails with some weird error like can’t store object BLABLA: No such file or directory. If I click […]

Git Baby is a git and github fan, let's start git clone.