GitHub - twingg/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 1,129 Commits
charts		charts
vendor		vendor
.dockerignore		.dockerignore
.gitignore		.gitignore
.helmignore		.helmignore
.stignore		.stignore
Dockerfile		Dockerfile
Jenkinsfile		Jenkinsfile
Makefile		Makefile
OWNERS		OWNERS
OWNERS_ALIASES		OWNERS_ALIASES
README.md		README.md
functional_test.go		functional_test.go
go.mod		go.mod
go.sum		go.sum
jenkins-x.yml		jenkins-x.yml
main.go		main.go
main_test.go		main_test.go
production_test.go		production_test.go
skaffold.yaml		skaffold.yaml
watch.sh		watch.sh