leotm

# AppData\Roaming\Sublime Text 3\Packages\User\default_syntax.py

import sublime, sublime_plugin

class DefaultSyntaxCommand(sublime_plugin.EventListener):
   def on_new(self, view):
    # Replace <Language> with desired default language
    # Check in AppData\Local\Sublime Text 3\Cache
    view.set_syntax_file('Packages/<Language>/<Language>.tmLanguage')

davbeck

import Foundation


protocol GQLNodeArgument {}
extension String: GQLNodeArgument {}
extension NSNumber: GQLNodeArgument {}


class GQLNode: StringLiteralConvertible, ArrayLiteralConvertible, Printable, DebugPrintable {
    let name: String?

eralston

//
//  NSMutableArray+WeakArray.h
//

#import <Foundation/Foundation.h>

///
/// Category on NSArray that provides read methods for weak pointers
/// NOTE: These methods may scan the whole array
///

katylava

Update 2022: git checkout -p <other-branch> is basically a shortcut for all this.

FYI This was written in 2010, though I guess people still find it useful at least as of 2021. I haven't had to do it ever again, so if it goes out of date I probably won't know.

Example: You have a branch refactor that is quite different from master. You can't merge all of the commits, or even every hunk in any single commit or master will break, but you have made a lot of improvements there that you would like to bring over to master.

Note: This will not preserve the original change authors. Only use if necessary, or if you don't mind losing that information, or if you are only merging your own work.