bskim45

vimdiff cheat sheet

##git mergetool

In the middle file (future merged file), you can navigate between conflicts with ]c and [c.

Choose which version you want to keep with :diffget //2 or :diffget //3 (the //2 and //3 are unique identifiers for the target/master copy and the merge/branch copy file names).

:diffupdate (to remove leftover spacing issues)

:only (once you’re done reviewing all conflicts, this shows only the middle/merged file)

bskim45

@Override
public boolean dispatchTouchEvent(MotionEvent ev) {

    final Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.fragment_container);
    if (fragment instanceof IDispatchTouchEvent)
        return ((IDispatchTouchEvent) fragment).dispatchTouchEvent(ev) || super.dispatchTouchEvent(ev);

    return super.dispatchTouchEvent(ev);
}

bskim45

System directories

Method	Result
Environment.getDataDirectory()	/data
Environment.getDownloadCacheDirectory()	/cache
Environment.getRootDirectory()	/system

External storage directories

bskim45

public static class ExceptionParser {
    private final ResponseBody body;
    private final String bodyString;
    private final Converter.Factory converterFactory;

    public ExceptionParser(Response response, Converter.Factory converterFactory) {
        this.converterFactory = converterFactory;
        this.body = cloneResponseBody(response.errorBody());
        this.bodyString = getBodyAsString(body);
    }

bskim45

#define AppId "{INSERT HERE YOUR GUID}"
#define AppName "My App"
#define AppVersion "1.7"

[CustomMessages]
english.NewerVersionExists=A newer version of {#AppName} is already installed.%n%nInstaller version: {#AppVersion}%nCurrent version: 
[Code]
// find current version before installation
function InitializeSetup: Boolean;
var Version: String;