I can load, build and run my app with no errors in XCode 4, apart from Git integration that is!
If I select the master branch and create a new branch and either auto switch or manually switch to the new brach XCode 4 hangs and eventually crashes.
Than when I try to re-open my project it is corrupt! Lucky I backed it up.
Has anyone else ha this issue? Thinking I may stick to console git mode!
Any help gratefully received ;-)
OK:
removed git
removed xcode4
installed git
installed xcode4
opened project
in organiser the repositories are there again...cool
select master
create new branch
switch to new branch
activity indicator just spins and spins and spins?
click anywhere else in organiser....crash!
BUT....
open terminal window and git operates as usual add, commit, diff etc, all ok???
For now my experience with Xcode 4 tells me that anything that doesn't work is most probably the bug. So your best bet is to submit the bug report directly to Apple.
Try deleting the build directory and reopenning the project.
That fixed this problem for me.
Related
How do I go to a previous commit from GitHub Desktop? I did some work in my class yesterday and today when I pulled it said I needed to resolve merges, so I clicked continue from Main. Now I do not have the version in my unity, but I do have it in History. I would like to go back to that version.
I do not have the command line, please only options on GUI version.
I do not want to try anything without asking because last time it caused a lot of errors and corruption in my previous project.
Create branch from commit is probably your best bet. It will ask you to enter a name for the new branch. Once your done you can use the branch tab to switch back to your development branch.
I have 2 branches: master & develop. I have been developing in "develop" and committed everything I need. What was left (application generated file: .out) I didn't care for! So when I went to switch branch, I got prompted following:
I clicked "Reset" however instead of switching to the branch I got prompted the same "Checkout Conflicts" windows with exactly the same choices. I clicked "Reset" again, however above process just repeated. I clicked a while -- no help the same happens again and again. More over I encountered the same scenario on different eclipses (Juno, Kepler) and different OS (Mac & Windows).
Am I doing something wrong? I don't want to commit or stash the file, I just want it to be reset. Is it a bug? Or there is a solution?
Thank you.
Add *.out to your .gitignore to get rid of those files once and forever.
In my version of egit, when i select reset, the reset window opens. Seems like a bug in your version. Try updating egit (not only eclipse).
If it still doesn't work, you can also use Team -> Reset... to perform a reset. After that you should be able to change the branches.
Actually, there are a few more ways to kill a file:
just delete the file
commit it and then reset the branch to the commit before that (effectively getting rid of that commit)
commit it and then perform an git rebase -interactive and delete the corresponding line
Feel free to edit this post and add more ways of violently killing a file from git!
I'm new to SCM and I've managed to create and use a repository for an existing project. By following a variety of posts, I've done the following:
1) Created an account on Assembla
2) Used bash/git in my existing project directory to add, commit, and push the project
3) Used Source Control in XCode to pull, modify, commit, and push changes
Now I want to start a new projection Xcode, and it seems I have to go through the same steps, using a mixture of Xcode 4.2 and bash commands to get the new project into Assembla.
For example, I created a new space on Assembla "newjunk", started a new project in Xcode "newjunk" and did NOT check "create local git repository". I did not run any bash/git commands. In Xcode I cannot "push" because I did not "commit", and I can't "commit" because "no valid working copies were found".
Is this the only way to get a new project into a remote repository?
Or can it all be done from within Xcode, and if so how?
EDIT: Note - I've tried these steps (modified for Assembla and Xcode 4.2) http://www.mindthe.net/devices/2011/04/28/12-steps-to-using-github-with-xcode-4/ which is how I got the "no valid..." message
This helped me a lot
http://helpdesk.assembla.com/customer/portal/articles/678953-setting-up-git-on-windows
I preffered using TortoiseGit
So I have a project I created a year or so ago and I've been manually saving the files to an external hard drive every new version. With Xcode 4.2, source control is now totally integrated into Xcode. Or so I thought. The problem I have in not creating the git repo (see below) but getting it to work with Version Control.
In my directory (cd in) I did the following to create a git repository. I see it as such in the Organizer in Xcode and in Github for Mac. It truly is a git repo.
git init
git add .
git commit -m 'First commit'
But in Xcode, when I change a file, there is no M or A badge or otherwise that appears to let me know it's been changed. What's more, the source control contextual menu items are all disabled and thus entirely useless. I don't want to have to commit or revert in the Organizer or command line every time.
How do I enable this part of version control in Xcode? Some tag I add to the .xcodeproj file? A bool somewhere? A setting somewhere? Anyone know? Thanks!
So I figured out the problem. I had to clean the project before it would show me the badges. I restarted Xcode after that as well, which may or may not have helped. In any case, after that, it worked perfectly.
I have also found a new clean linked repo to be the answer. Simply drag the whole folder containing the xcode proj file into the Git workspace and follow the prompts. After that all is linked and cool. That said I am aware that there may be more elegant solutions and answers.
I just started to use SVN with Xcode and stumbled upon several problems. I have started to work with SVN repository that was deployed on a remote server. The project had a standard directory structure (trunk, branches, tags). I have checked out the project with Xcode, did some work, performed commit (from Xcode). The teammate checked out that version. Then using Xcode, I have added new images folder and images to svn repository, and successfully performed commit. I ensure you that the image folder and the images were successfully uploaded to SVN server, because I saw that folder and images in trunk both from Xcode organizer and from browser, when was viewing the project remote files.
Now, my teammate performed update from Xcode (via file -> source -> update) but the image folder and images have not been retrieved. Xcode 4 just showed a message that a "project is up to date". He also went to organizer, then selected the trunk of repository and pressed update button, but the same message about project being up to date was shown. After more several tries, he deleted his local project files and performed checkout, but now the images were successfully retrieved. What might be a cause of such problem?
I know that for all required tasks I might use svn terminal commands, just curious is it sufficient to use Xcode 4 without command line.
We've had several issues with Xcode's SVN and have had to resort to the command line a few times to resolve them. Sometimes restarting Xcode has been enough, but if not here's a few simple svn commands that might help shed light on the issue, execute these from your project's root folder:
To check what state your SVN is in:
svn status
To update to most recent:
svn update
To commit:
svn commit -m "A commit message"