

- Araxis merge sourcetree .gitconfig install#
- Araxis merge sourcetree .gitconfig free#
- Araxis merge sourcetree .gitconfig mac#
You’ll want to first install the latest Xcode command line tools (either from Second shows something like “ /Developer”, If the first command shows something like “4.0.x” and the Xcode command line tools you currently have: If you open terminal, you can verify which version of the However, since it had both an older version of the Xcode command line tools associated with Xcode that was installed before things moved to the App Store as well as the latest version (4.3.2), I ran into an issue where MacPorts didn't like the current version of the command line tools that were being linked. Lately I had a spare machine that I wanted to install MacPorts ports such as " coreutils" onto. I will be expanding on this post for each of the sessions that I attended soon. Slides from all of the talks are still in the process of being uploaded, so check this link often. Making Successful Apps (Michael Simmons).Advanced Behavior and Performance Testing with UI Automation (Johanthan Penn).Keynote: A Pocketful of Patterns (Daniel Steinberg).iOS Performance Tuning with Instruments (Bill Dudney).Less Code, More Fulfilling (Daniel Steinberg).We Made An App For That (presentation of interesting apps people are working on where the winner was chosen based on applause levels) (Jaimee Newberry).Stronger, Better, Faster with Instruments and Debugging (Kyle Richter).Zen and the Introduction to Gesture Recognizers (Johnathan Penn).Keynote: The People We Work For (Matt Drance).Introducing Collection Views (Mark Pospesel).Mastering the Project File (Michele Titolo).2-D Game Development Workshop (covered both prototyping techniques and the Cocos2D/Kobold2D frameworks) (Josh Smith).
Araxis merge sourcetree .gitconfig mac#
It was an intimate gathering of Mac and iOS developers with a bunch of interesting talks, including keynote presentations from important developers in the industry. This past week I attended the CocoaConf conference in San Jose.
Araxis merge sourcetree .gitconfig free#
Hopefully you've found this helpful! Feel free to post any other Git command line tips and tricks that you like to use.

Nothing beats the main documentation and a book I recommend reading is Version Control with Git. Obviously, you can configure Git in many more ways than this. For example, when working on the master branch of the Librarian project, my shell prompt looks Librarian (master)]$ Like the Git completion script, you'll want to create a ~/.git-prompt.sh file at your root directory and then add it to your shell startup configuration similar to the git-completion script. Simply create a ~/.git-completion.sh file at your root directory and paste in the contents of the script appropriate for your shell environment and add it to your shell startup configuration (~/.bash_profile in my case) like so:įinally, you can show what branch you're currently working on via a Git prompt script. This script can help you auto-complete branch paths and more. Next you will want to add a Git completion script appropriate for your shell environment.
