smoll

Using DiffMerge as your git mergetool (for Mac OS X / macOS)

Reference(s):

• http://twobitlabs.com/2011/08/install-diffmerge-git-mac-os-x/
• http://stackoverflow.com/a/1251696

Step 1: download and install the DiffMerge OS X Installer

http://www.sourcegear.com/diffmerge/downloads.php - get the installer version, NOT the dmg version

bojan

# --------------------------------
# macOS temporary files
# --------------------------------
.DS_Store
*.lock
*.swp

# --------------------------------
# Xcode
# --------------------------------

markSci5

@interface UINavigationController (autorotation)

-(BOOL)shouldAutorotate;
-(NSUInteger)supportedInterfaceOrientations;

@end

markSci5

@implementation UIStoryboard (MyApp)

+ (UIStoryboard *)mainStoryboard {
    return [UIStoryboard storyboardWithName:@"MainStoryboard" bundle:nil];
}

@end

markSci5

// Get the storyboard named secondStoryBoard from the main bundle:
UIStoryboard *secondStoryBoard = [UIStoryboard storyboardWithName:@"secondStoryBoard" bundle:nil];
// Load the initial view controller from the storyboard. // Set this by selecting 'Is Initial View Controller' on the appropriate view controller in the storyboard.
UIViewController *theInitialViewController = [secondStoryBoard instantiateInitialViewController];
// Then push the new view controller in the usual way:
[self.navigationController pushViewController:theTabBar animated:YES]; 

markSci5

/ - Quick Add
Hold Shift while resizing - Maintain aspect ration
Hold Command while moving object - Removes snapping
Shift + Direction while an object is selected - Moves object faster
Command + Alt + (Shift) + Direction while an object is selected - Resizes object
Command + Up/Down - Moves selected layer up or down 1 level
Command + (Shift) + Up/Down - Moves selected layer to top or bottom layer
Alt + Drag object - Duplicate object
Shift + click another object - Add object to current selection
Command + click another object - Add object to current selection

markSci5

//To fetch a branch, you simply need to:

git fetch origin

//This will fetch all of the remote branches for you. With the remote branches 
//in hand, you now need to check out the branch you are interested in, giving 
//you a local working copy:

git checkout -b test origin/test

markSci5

git add -u

markSci5

#import <Foundation/Foundation.h>

@interface MySingleton : NSObject

- (id)sharedInstance;

@end