I usually use

sudo apt-get update

sudo apt-get upgrade

But sometimes things get “kept back”, like for example kernel upgrades.

You can do these using this command.

sudo aptitude safe-upgrade

And it gives you the option for the other updates.

The long story is here: http://www.clintharris.net/2009/iphone-app-shared-libraries/

The short story is here.

Global Settings, i.e. do this once:

1. Set up a shared build output directory that will be shared by all Xcode projects.
2. Add a “Source Tree” variable that Xcode can use to dynamically find the static library project. (for each project to be shared)

Per Project Settings, i.e. for each project that uses the shared code

1. Add the shared project to this project, DON’T select “Copy items into…”
2. On linked project properties/General tab, select “Relative to COCOS2D_SRC”
3. On the Target properties/General tab, add “Direct Dependencies” for the shared libs, e.g. cocos2d
4. On the Target properties/Build tab, ensure there is no hard coded path in the “Library Search Paths” also add a “User Header Search Path” of $(COCOS2D_SRC)
5. Drag the required static libraries from the shared project into the “Link Binary with Libraries” folder for your target.

And thats it :)

So you’ve made some changes locally but there are changes on the server that you want – so you want to merge them into your workarea.

Great, git pull… but no, this aborts if there are local uncommitted changes :( .

So, instead, you – you can either throw away the local changes using “git reset –hard”.

Or if you want to keep them, use “git stash”, like this:

git stash – saves your changes away on a branch.
git pull to get the remote changes
git stash apply to apply your local changes to your workarea.

Why couldn’t they just merge, or at least have an option for it? :(

You’ve started that funky new project on your PC, done a few bits, checked it into your local Git repository, but now you’ve decided to push it onto your remote repository.

Assumed that you are using ssh to connect to the remote machine.

Firstly, on the remote box, make the directory for your project, cd into it and then set it up as a git repository, like so:
git init --bare --shared
Then back in your project, where you’ve previously done a git init, git add . and git commit -m "comments", do this:
git remote add origin [user]@[git host]:[path to project dir on host]
This tells git where the remote origin is for your local project.
Then you need to push your local code into that repository, with this command:
git push origin master

This will create the repo.

There are 2 other things to be wary of:
– how to use your local repo and push/pull to the remote one.
When you first do a git pull back into your local repo, you may well get an error like this
You asked me to pull without telling me which branch you
want to merge with, and 'branch.master.merge' in
your configuration file does not tell me either. Please
specify which branch you want to merge on the command line and
try again (e.g. 'git pull ').
See git-pull(1) for details.
To fix this, you need to do tweak the local settings … but perhaps its easiest just to clone it again and things will be set as needed.

If you often merge with the same branch, you may want to
configure the following variables in your configuration
file:

branch.master.remote =
branch.master.merge =
remote..url =
remote..fetch =

This does it quite well:

git config branch.master.remote origin && git config branch.master.merge refs/heads/master


– how to clone it, so you can push/pull too. TBD

EDIT:

This link also covers things quite well.