So I have been having troubles pushing my most recent commits to a remote repository that I have set up on Bitbucket. I am originally using Xcode, and have asked this question and was recommended to use terminal to push instead of Xcode. Now, I tried terminal but that did not solve the problem. But […]
In Xcode 5.0.2, I try to pull from a remote and am given the following message: “The working copy ‘project-name’ has uncommitted changes. Commit or discard the changes and try again.” Fair enough. I pull up the commit dialog, and am then given the message, “This file does not exist at the requested revision.” Clicking […]
This question already has an answer here: Git ignore file for Xcode projects 17 answers
When using Xcode 8’s built-in source control, switching between two branches almost always causes Xcode to freeze and requires force quitting the app. My branches aren’t particularly worlds apart. Doesn’t seem like it’s guzzling excessive memory or CPU either. What’s the deal?
I am using git version 1.9.2 with Xcode6-Beta3. At beginning, git gui works properly. For some reason (which I don’t know…) when typing “git gui” on Terminal, I got the following crash message: * Terminating app due to uncaught exception ‘NSInternalInconsistencyException’, reason: ‘Error (1000) creating window shape’ SOME CALL STACK INFO libc++abi.dylib: terminating with uncaught […]
I know there’s an option to make a local repository for your project when you first create it, but is there an option create a repository after you’ve created your project?
So I migrated my AppIcons and LaunchImages to Images.xcassets, which is working fine it seems. But I made some modifications to the launch images, and now I went to commit the changes (I’m using a local-only git repo), and it seems Images.xcassets is not allowed to be committed to source control? Right-clicking on it, all […]
I’m working in a Xcode project, and I’m trying to configure the .gitignore to not get anything inside the xcuserdata folder. I have the following .gitignore: # Xcode .DS_Store */build/* *.pbxuser !default.pbxuser *.mode1v3 !default.mode1v3 *.mode2v3 !default.mode2v3 *.perspectivev3 !default.perspectivev3 xcuserdata profile *.moved-aside DerivedData .idea/ *.hmap xcuserdata/* but every time that I build/run the project and execute […]
In Xcode, what’s the best way to avoid Git conflict in the project file? (I am in manual git, not using Xcode interface for git) I’ve cloned mapbox-ios-sdk from Github, hacked it, and now the remote master has changed. When I tried to pull the remote changes into my local, after merging there would be […]
Which files are better to ignore in git for an Xcode 4(.3.2)? This older question addresses the same issue but I find my structure to be different so I assume it’s about an older version of Xcode.