From 8b11bdf1311d91e02a3014f488def134bc71e7e4 Mon Sep 17 00:00:00 2001
From: Jacob Rose <jacob@usroses.org>
Date: Sun, 16 Jun 2019 07:08:11 -0400
Subject: [PATCH 1/2] Updated build instructions post-Etsy

The git repo path has changed now that Hound is its own org.

I also added an example build session for folks like me who
don't have other Go projects, and included the "go get" step
in these new build instructions, without which I wasn't able
to build.
---
 README.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/README.md b/README.md
index b778e4d4..abc76066 100644
--- a/README.md
+++ b/README.md
@@ -103,8 +103,22 @@ Go tools work accordingly. See [Setting GOPATH](https://github.com/golang/go/wik
 up your Go workspace. With a `GOPATH` set, the following commands will build hound locally.
 
 ```
+<<<<<<< HEAD
 git clone https://github.com/hound-search/hound.git ${GOPATH}/src/github.com/hound-search/hound
 cd ${GOPATH}/src/github.com/hound-search/hound
+=======
+git clone https://github.com/hound-search/hound.git ${GOPATH}/src/github.com/etsy/hound
+cd ${GOPATH}/src/github.com/etsy/hound
+>>>>>>> Updated build instructions post-Etsy
+make
+```
+
+If this is your only Go project, you can set your GOPATH just for Hound:
+```
+git clone https://github.com/hound-search/hound.git
+cd hound
+export GOPATH=`pwd`
+go get github.com/etsy/hound/cmds/...
 make
 ```
 

From 2cc9d1a122ab4646ea8ec52596ae6693c19a1f12 Mon Sep 17 00:00:00 2001
From: Kelly Norton <kellegous@gmail.com>
Date: Mon, 17 Jun 2019 09:40:04 -0400
Subject: [PATCH 2/2] Update build instructions to not pull source twice.

---
 README.md | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index abc76066..2ac9ba8f 100644
--- a/README.md
+++ b/README.md
@@ -103,23 +103,15 @@ Go tools work accordingly. See [Setting GOPATH](https://github.com/golang/go/wik
 up your Go workspace. With a `GOPATH` set, the following commands will build hound locally.
 
 ```
-<<<<<<< HEAD
 git clone https://github.com/hound-search/hound.git ${GOPATH}/src/github.com/hound-search/hound
 cd ${GOPATH}/src/github.com/hound-search/hound
-=======
-git clone https://github.com/hound-search/hound.git ${GOPATH}/src/github.com/etsy/hound
-cd ${GOPATH}/src/github.com/etsy/hound
->>>>>>> Updated build instructions post-Etsy
 make
 ```
 
 If this is your only Go project, you can set your GOPATH just for Hound:
 ```
-git clone https://github.com/hound-search/hound.git
-cd hound
-export GOPATH=`pwd`
-go get github.com/etsy/hound/cmds/...
-make
+git clone https://github.com/hound-search/hound.git src/github.com/hound-search/hound
+GOPATH=$(pwd) make -C src/github.com/hound-search/hound
 ```
 
 ### Testing