| // | |
| // Signal+Extensions.swift | |
| // Khan Academy | |
| // | |
| // Created by Nacho Soto on 10/1/15. | |
| // Copyright © 2015 Khan Academy. All rights reserved. | |
| // | |
| import ReactiveCocoa |
| // (c) 2015 Nate Cook, licensed under the MIT license | |
| // | |
| // Initializers for Dictionary like NSDictionary +dictionaryWithObjects:forKeys: | |
| public extension Dictionary { | |
| /// Creates a new Dictionary from the given `keys` and `values` collections. | |
| /// | |
| /// More efficient than the sequence version because it can reserve the correct | |
| /// capacity before filling the dictionary. Returns `nil` if the lengths of the | |
| /// two collections differ. |
| # xcode-build-bump.sh | |
| # @desc Auto-increment the build number every time the project is run. | |
| # @usage | |
| # 1. Select: your Target in Xcode | |
| # 2. Select: Build Phases Tab | |
| # 3. Select: Add Build Phase -> Add Run Script | |
| # 4. Paste code below in to new "Run Script" section | |
| # 5. Drag the "Run Script" below "Link Binaries With Libraries" | |
| # 6. Insure that your starting build number is set to a whole integer and not a float (e.g. 1, not 1.0) |
FileMerge (opendiff) can really come in handy when you need to visually compare merging conflicts. Other times it's just a nice visual way to review your days work.
The following method works by creating a simple bash script (git-diff-cmd.sh) that sets us up with the proper command line arguments for Git to pass off files to FileMerge.