Skip to content

vfarcic/go-demo-6

This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Folders and files

NameName
Last commit message
Last commit date

Latest commit

6cfb9d3 · Feb 11, 2020
Feb 11, 2020
Dec 17, 2018
Feb 11, 2020
Dec 14, 2018
Feb 11, 2020
Feb 11, 2020
Feb 11, 2020
Feb 11, 2020
Feb 11, 2020
Dec 26, 2018
Dec 14, 2018
May 20, 2019
Feb 11, 2020
Dec 30, 2018
Dec 14, 2018
Dec 14, 2018
Feb 11, 2020
Feb 11, 2020

Repository files navigation

Replace master with orig

git checkout orig

git merge -s ours master

git checkout master

git merge orig

git push