$ git standup
$ git conflict - Open all conflicted merge files with Git

https://coderwall.com/p/j7kxsa
Globally ignore Podfiles