Will the real git shady please stand up!#40

skotyankar wants to merge 1 commit intonanliu:masternanliu/git_learning:masterfrom

skotyankar:conflictskotyankar/git_learning:conflictCopy head branch name to clipboard