commit fe1384b19c39175d3743511c0d13cf4322b22ad1
author Matt Farina <matt@mattfarina.com> Thu Mar 24 10:05:00 2016 -0400
committer Matt Farina <matt@mattfarina.com> Thu Mar 24 10:05:00 2016 -0400
tree 8fa3e17bd6a197758791c250691cae021eabd52c
parent 8099e934776d0e92e5eee81a5d0133ed1fb7dd14
parent 7a460ca7b6d307b862d67e9c5ce2acf2878d3b9f

Merge pull request #350 from Masterminds/feat/interactive

More detailed conflict information

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index f54bf18..a26f346 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,4 +22,9 @@
   - GO15VENDOREXPERIMENT=1 make test
 
 notifications:
-  irc: "irc.freenode.net#masterminds"
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/67e4b42cbf763625d0b4
+    on_success: change
+    on_failure: always
+    on_start: never

README.md

diff --git a/README.md b/README.md
index 6b1a900..74c338b 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@
 installed by a tool (e.g. glide), similar to `go get` or they can be vendored and
 distributed with the package.
 
-[![Build Status](https://travis-ci.org/Masterminds/glide.svg)](https://travis-ci.org/Masterminds/glide) [![Go Report Card](http://goreportcard.com/badge/Masterminds/glide)](http://goreportcard.com/report/Masterminds/glide) [![GoDoc](https://godoc.org/github.com/Masterminds/glide?status.svg)](https://godoc.org/github.com/Masterminds/glide) [![Documentation Status](https://readthedocs.org/projects/glide/badge/?version=latest)](http://glide.readthedocs.org/en/latest/?badge=latest) [![Join us on #masterminds on Freenode](https://www.irccloud.com/invite-svg?channel=%23masterminds&hostname=irc.freenode.net&port=6697&ssl=1)](https://www.irccloud.com/invite?channel=%23masterminds&hostname=irc.freenode.net&port=6697&ssl=1)
+[![Build Status](https://travis-ci.org/Masterminds/glide.svg)](https://travis-ci.org/Masterminds/glide) [![Go Report Card](http://goreportcard.com/badge/Masterminds/glide)](http://goreportcard.com/report/Masterminds/glide) [![GoDoc](https://godoc.org/github.com/Masterminds/glide?status.svg)](https://godoc.org/github.com/Masterminds/glide) [![Documentation Status](https://readthedocs.org/projects/glide/badge/?version=latest)](http://glide.readthedocs.org/en/latest/?badge=latest) [![Join the chat at https://gitter.im/Masterminds/glide](https://badges.gitter.im/Masterminds/glide.svg)](https://gitter.im/Masterminds/glide?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 ### Features