marcosscriven

package com.myco.codestyle;

import com.intellij.codeInsight.actions.OptimizeImportsProcessor;
import com.intellij.codeInsight.actions.ReformatCodeProcessor;
import com.intellij.ide.impl.ProjectUtil;
import com.intellij.ide.plugins.PluginManager;
import com.intellij.idea.IdeaApplication;
import com.intellij.idea.Main;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ApplicationStarter;

marcosscriven

/Applications/Google\ Chrome.app/Contents/MacOS/Google\ Chrome --app=http://www.bbc.co.uk/iplayer

# Couldn't get this to work if you already have a profile running 
# open -b com.google.Chrome --args --app=http://www.bbc.co.uk/iplayer

marcosscriven

Despite the commit I'm cherry picking not touching the 3rdparty dir at all, I get this merge issue:

On branch master
Your branch is up-to-date with 'origin/master'.
You are currently cherry-picking commit 6c7143d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

marcosscriven

A
1
B

C
3