GitHub - marburps/go-demo-6

Replace master with orig

git checkout orig

git merge -s ours master

git checkout master

git merge orig

git push

Name		Name	Last commit message	Last commit date
Latest commit History 202 Commits
vendor		vendor
.gitignore		.gitignore
README.md		README.md
functional_test.go		functional_test.go
main.go		main.go
main_test.go		main_test.go
production_test.go		production_test.go