git checkout orig
git merge -s ours master
git checkout master
git merge orig
git push
forked from vfarcic/go-demo-6
-
Notifications
You must be signed in to change notification settings - Fork 0
xoJIog/go-demo-6
Folders and files
| Name | Name | Last commit message | Last commit date | |
|---|---|---|---|---|
Repository files navigation
About
No description, website, or topics provided.
Resources
Stars
Watchers
Forks
Packages 0
No packages published
Languages
- Go 70.6%
- Makefile 24.5%
- Smarty 3.3%
- Shell 1.2%
- Dockerfile 0.4%