auremoser

Intro to Web Mapping + GIS

###Girl Develop It

Aurelia Moser, @auremoser, [email protected]

Andy Eschbacher, @MrEPhysics, [email protected]

August 19th, 2015

Find this document here:

jacobvosmaer

Open all files with git merge conflicts in MacVim

git diff --name-only | uniq | xargs mvim

When git encounters a merge conflict, e.g. during a rebase, it drops you back into the shell with a dirty working directory. I like this one-liner for opening all files with a merge conflict in MacVim.

Once you're in Vim, you can then switch between the files with :n and :prev, or another favourite: :w | n (save current file and open the next command line-supplied file).

UPDATE: see below for a version that works with real terminal commands.