Dan Ramteke

I learned some Git last night.

I started working on an iPhone portion to Delicious Restaurants. I made a branch in git to store it named iphone, with the rails app still living in master. So far I’m happy with this set up, except that Xcode complains that everything on disk got deleted everytime I checkout a different branch.

I also learned this: To convert a branch to a tracking branch, add

[branch "iphone"]
    remote = origin
    merge = refs/heads/iphone

to your .git/config, although there are also some git config commands you can use intead.