Skip to content

docker-flow/go-demo-6

 
 

Repository files navigation

Replace master with orig

git checkout orig

git merge -s ours master

git checkout master

git merge orig

git push

About

No description, website, or topics provided.

Resources

Stars

Watchers

Forks

Packages

No packages published

Languages

  • Go 72.1%
  • Makefile 23.0%
  • Smarty 3.4%
  • Shell 1.1%
  • Dockerfile 0.4%